From a6fe04d72a44e4a9b1fe3a9c61d4c231df605007 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Tue, 23 Aug 2005 17:20:44 -0300 Subject: [PATCH] --- yaml --- r: 6007 b: refs/heads/master c: 566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba h: refs/heads/master i: 6005: f62c6951bb4457877a21f7a7d47d8a26d116cf44 6003: 279d4e52bf1a2c8691bef400d73955cd2cc0650b 5999: 05bdf71070e5f1db534dea2ee793173f77506f98 v: v3 --- [refs] | 2 +- trunk/arch/ppc/syslib/m8xx_setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 290d72ee8dac..8b1b8f8672f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3515d0161d55d2fa1a340932625f94240a68c262 +refs/heads/master: 566ecb9b258ec4da3c7e1c6ca6fca8a5bb0c8eba diff --git a/trunk/arch/ppc/syslib/m8xx_setup.c b/trunk/arch/ppc/syslib/m8xx_setup.c index 55a381af4e37..a3702cfe8f7c 100644 --- a/trunk/arch/ppc/syslib/m8xx_setup.c +++ b/trunk/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 }