diff options
author | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 13:40:55 -0600 |
---|---|---|
committer | Dave Kleikamp <shaggy@linux.vnet.ibm.com> | 2009-02-02 13:40:55 -0600 |
commit | 8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c (patch) | |
tree | da9759151e00221c58cdd9f4de893c0b08753670 /arch/m68knommu/include/asm/setup.h | |
parent | 1ad53a98c927a9b5b1b57288ac0edec562fbcf8d (diff) | |
parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
download | blackbird-op-linux-8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c.tar.gz blackbird-op-linux-8db0c5d5ef3ab99fe9e5151872b75f45c4282e3c.zip |
Merge branch 'master' of /home/shaggy/git/linus-clean/
Diffstat (limited to 'arch/m68knommu/include/asm/setup.h')
-rw-r--r-- | arch/m68knommu/include/asm/setup.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68knommu/include/asm/setup.h b/arch/m68knommu/include/asm/setup.h deleted file mode 100644 index fb86bb2a6078..000000000000 --- a/arch/m68knommu/include/asm/setup.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifdef __KERNEL__ - -#include <asm-m68k/setup.h> - -/* We have a bigger command line buffer. */ -#undef COMMAND_LINE_SIZE - -#endif /* __KERNEL__ */ - -#define COMMAND_LINE_SIZE 512 |