diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-07-11 07:58:33 +0200 |
| commit | f64075972b8dc4ec4a701506e5fe8075113d3c4a (patch) | |
| tree | e8c13889eec312fcb7e32ed040017a16204bd005 /include | |
| parent | e54183d6d4eb575051e67a020094787c113f238d (diff) | |
| parent | b06ecabed947ed778ee2f271c0cb0cc8c4483f5d (diff) | |
| download | barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.gz barebox-f64075972b8dc4ec4a701506e5fe8075113d3c4a.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/.gitignore | 1 | ||||
| -rw-r--r-- | include/linux/compiler.h | 4 | ||||
| -rw-r--r-- | include/platform_data/eth-smc911x.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/.gitignore b/include/.gitignore index 18e58a752a..f28372a3df 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1 +1,2 @@ +asm /config.h diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 020ad16a04..91331dd12f 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -4,8 +4,8 @@ #ifndef __ASSEMBLY__ #ifdef __CHECKER__ -# define __user __attribute__((noderef, address_space(1))) -# define __kernel __attribute__((address_space(0))) +# define __user /* no user address space in barebox */ +# define __kernel /* default address space */ # define __safe __attribute__((safe)) # define __force __attribute__((force)) # define __nocast __attribute__((nocast)) diff --git a/include/platform_data/eth-smc911x.h b/include/platform_data/eth-smc911x.h index 4a802ee52c..c97a2967c9 100644 --- a/include/platform_data/eth-smc911x.h +++ b/include/platform_data/eth-smc911x.h @@ -12,7 +12,7 @@ * Pass pointer to this structure as part of device_d -> platform_data */ struct smc911x_plat { - int shift; + u32 shift; unsigned int flags; unsigned int phy_mask; /* external PHY only: mask out PHYs, e.g. ~(1 << 5) to use PHY addr 5 */ |