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

Marcelo Tosatti · Linus Torvalds · commit 566ecb9b258e · 2005-08-26T16:31:46.000-07: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 &lt;marcelo.tosatti@cyclades.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,`
`423`	`423`	`ppc_md.find_end_of_memory = m8xx_find_end_of_memory;`
`424`	`424`	`ppc_md.setup_io_mappings = m8xx_map_io;`
`425`	`425`
`426`		`-#if defined(CONFIG_BLK_DEV_IDE) \|\| defined(CONFIG_BLK_DEV_IDE_MODULE)`
	`426`	`+#if defined(CONFIG_BLK_DEV_MPC8xx_IDE)`
`427`	`427`	`m8xx_ide_init();`
`428`	`428`	`#endif`
`429`	`429`	`}`