From cd94d937544e9688dbe64f7a4442de2bedfa9cb8 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 1 Oct 2011 22:03:37 +0200 Subject: [PATCH] --- yaml --- r: 272491 b: refs/heads/master c: ec13592060ed809c5d6af50f2fcc0b4cc18e3f77 h: refs/heads/master i: 272489: 8c77b120c3da21e6d4ef10769c5d95e0ff3fced8 272487: 26285a47d20b8697ffc60a015f3ec7c7345705ce v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 319edb66fff1..a3f20fe8b794 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba4a90a6d86a428c295775b46e653ab8f8e459b8 +refs/heads/master: ec13592060ed809c5d6af50f2fcc0b4cc18e3f77 diff --git a/trunk/arch/arm/mach-pxa/include/mach/zylonite.h b/trunk/arch/arm/mach-pxa/include/mach/zylonite.h index ea24998b923c..ecca976f03d2 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/zylonite.h +++ b/trunk/arch/arm/mach-pxa/include/mach/zylonite.h @@ -19,7 +19,7 @@ extern int wm9713_irq; extern int lcd_id; extern int lcd_orientation; -#ifdef CONFIG_CPU_PXA300 +#ifdef CONFIG_MACH_ZYLONITE300 extern void zylonite_pxa300_init(void); #else static inline void zylonite_pxa300_init(void) @@ -29,7 +29,7 @@ static inline void zylonite_pxa300_init(void) } #endif -#ifdef CONFIG_CPU_PXA320 +#ifdef CONFIG_MACH_ZYLONITE320 extern void zylonite_pxa320_init(void); #else static inline void zylonite_pxa320_init(void)