projects/linux·commit 566ecb9b

[PATCH] ppc32 8xx: fix m8xx_ide_init() #ifdef

566ecb9b · Marcelo Tosatti <[email protected]> · 2005-08-23 17:20:44 -03:00

Be more precise on deciding whether to call m8xx_ide_init() at
m8xx_setup.c:platform_init().

Compilation fails if CONFIG_BLK_DEV_IDE is defined but
CONFIG_BLK_DEV_MPC8xx_IDE isnt.

Signed-off-by: Marcelo Tosatti <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba
Parents
3515d016

Changes

1 files changed · +1 −1

FileStatusAddDelContent
arch/ppc/syslib/m8xx_setup.cmodified+1−1View file

arch/ppc/syslib/m8xx_setup.c

View file
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index 55a381a..a3702cf 100644
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -423,7 +423,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
ppc_md.find_end_of_memory = m8xx_find_end_of_memory;
ppc_md.setup_io_mappings = m8xx_map_io;
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
+#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)
m8xx_ide_init();
#endif
}