diff options
| author |   Marcelo Tosatti <marcelo.tosatti@cyclades.com> | 2005-08-23 17:20:44 -0300 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 16:31:46 -0700 |
| commit | 566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba (patch) | |
| tree | e1a4b3057c291722ebef4dbb9c0fac834908b4dd /arch/ppc/syslib | |
| parent | [PATCH] late spinlock initialization in ieee1394/ohci (diff) | |
| download | linux-dev-566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba.tar.xz linux-dev-566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba.zip | |
[PATCH] ppc32 8xx: fix m8xx_ide_init() #ifdef
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 <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib')
| -rw-r--r-- | arch/ppc/syslib/m8xx_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 55a381af4e37..a3702cfe8f7c 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 } |