Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 3da45d051743..d98023f55503 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -802,10 +802,12 @@ static void __init spitz_init(void)
 {
         spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
 
+#ifdef CONFIG_MACH_BORZOI
         if (machine_is_borzoi()) {
                 sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
                 sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
         }
+#endif
 
         platform_scoop_config = &spitz_pcmcia_config;