diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2012-10-12 15:11:08 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-10-12 15:11:08 -0400 |
| commit | d20f2f83b2374c1cee042981cb45493a3e06b6a5 (patch) | |
| tree | 9b9350f65c23d0166aaa314559c37fdff0b0d62a /arch/tile/include/asm/setup.h | |
| parent | ccff9b1db693062b0a9c9070f4304deb47ef215c (diff) | |
| parent | df842f79f0e2aed9092a73f611f41f03630a3823 (diff) | |
Merge tag 'tags/disintegrate-tile-20121009' into for-linus
UAPI Disintegration 2012-10-09
Diffstat (limited to 'arch/tile/include/asm/setup.h')
| -rw-r--r-- | arch/tile/include/asm/setup.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h index c67eb70ea78..d048888c5d9 100644 --- a/arch/tile/include/asm/setup.h +++ b/arch/tile/include/asm/setup.h @@ -11,16 +11,13 @@ * NON INFRINGEMENT. See the GNU General Public License for * more details. */ - #ifndef _ASM_TILE_SETUP_H #define _ASM_TILE_SETUP_H -#define COMMAND_LINE_SIZE 2048 - -#ifdef __KERNEL__ #include <linux/pfn.h> #include <linux/init.h> +#include <uapi/asm/setup.h> /* * Reserved space for vmalloc and iomap - defined in asm/page.h @@ -53,6 +50,4 @@ int hardwall_ipi_valid(int cpu); } while (0) #endif -#endif /* __KERNEL__ */ - #endif /* _ASM_TILE_SETUP_H */ |