diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
| commit | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch) | |
| tree | 03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /include/asm-m68knommu/setup.h | |
| parent | 4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff) | |
| parent | 58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff) | |
| download | lwn-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.tar.gz lwn-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'include/asm-m68knommu/setup.h')
| -rw-r--r-- | include/asm-m68knommu/setup.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-m68knommu/setup.h b/include/asm-m68knommu/setup.h deleted file mode 100644 index fb86bb2a6078..000000000000 --- a/include/asm-m68knommu/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 |