[PATCH] m68knommu: fix compile when CONFIG_BLK_DEV_INITRD=n
authorAdrian Bunk <bunk@stusta.de>
Mon, 4 Dec 2006 07:26:44 +0000 (17:26 +1000)
committerLinus Torvalds <torvalds@woody.osdl.org>
Mon, 4 Dec 2006 16:26:11 +0000 (08:26 -0800)
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>
arch/m68knommu/kernel/setup.c

index 7b21959eaeae66b17f08f5337e42f06cb2842299..9cf2e4d1fc77e3cf725069b37084e2bb01877063 100644 (file)
 #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;