summaryrefslogtreecommitdiff
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-04 10:26:44 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-04 19:26:11 +0300
commit1b9552af943f54336333c9a6e02f5ed9f18e0bcc (patch)
tree5eae32496f42a75fc846ebc618314d8da2ecad72 /arch/m68knommu
parent6869e940c2244554ad8858f8c4f07bf7e2fd5e3d (diff)
downloadlinux-1b9552af943f54336333c9a6e02f5ed9f18e0bcc.tar.xz
[PATCH] m68knommu: fix compile when CONFIG_BLK_DEV_INITRD=n
This patch fixes the following compile error with CONFIG_BLK_DEV_INITRD=n and -Werror-implicit-function-declaration: ... CC arch/m68knommu/kernel/setup.o /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c: In function 'setup_arch': /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c:268: error: implicit declaration of function 'paging_init' make[2]: *** [arch/m68knommu/kernel/setup.o] Error 1 Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/kernel/setup.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index 7b21959eaeae..9cf2e4d1fc77 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -36,10 +36,7 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/machdep.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
#include <asm/pgtable.h>
-#endif
unsigned long memory_start;
unsigned long memory_end;