Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-08 19:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

include/linux/compat.h: fix warning: preprocessor token {__iomem, __user} redefined

Browse source 
include/linux/compat.h:4:9: warning: preprocessor token __user redefined
include/linux/compiler.h:7:10: this was the original definition
include/linux/compat.h:5:9: warning: preprocessor token __iomem redefined
include/linux/compiler.h:12:10: this was the original definition

fixup __iomem, __user definitions in compat.h code appears to be placed
there as a cover up from a code import from linux when u-boot didn't yet
have a compiler.h, introduced by commit
932394ac43 "Rewrite of NAND code based on
what is in 2.6.12 Linux kernel".

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Kim Phillips 2012-10-29 13:34:24 +00:00 • committed by Tom Rini
parent eef1cf2d5c
commit 0d4c1c91bb
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/linux/compat.h
View file

@ -1,9 +1,6 @@
#ifndef _LINUX_COMPAT_H_ #ifndef _LINUX_COMPAT_H_
#define _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_
#define __user
#define __iomem
#define ndelay(x) udelay(1) #define ndelay(x) udelay(1)
#define printk printf #define printk printf

2
include/linux/mtd/mtd-abi.h
View file

@ -11,6 +11,8 @@
#include <linux/compat.h> #include <linux/compat.h>
#endif #endif
#include <linux/compiler.h>
struct erase_info_user { struct erase_info_user {
uint32_t start; uint32_t start;
uint32_t length; uint32_t length;