git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
zylonite.h
diff --git
a/arch/arm/mach-pxa/include/mach/zylonite.h
b/arch/arm/mach-pxa/include/mach/zylonite.h
index
ea24998
..
ecca976
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/zylonite.h
+++ b/
arch/arm/mach-pxa/include/mach/zylonite.h
@@
-19,7
+19,7
@@
extern int wm9713_irq;
extern int lcd_id;
extern int lcd_orientation;
extern int lcd_id;
extern int lcd_orientation;
-#ifdef CONFIG_
CPU_PXA
300
+#ifdef CONFIG_
MACH_ZYLONITE
300
extern void zylonite_pxa300_init(void);
#else
static inline void zylonite_pxa300_init(void)
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
}
#endif
-#ifdef CONFIG_
CPU_PXA
320
+#ifdef CONFIG_
MACH_ZYLONITE
320
extern void zylonite_pxa320_init(void);
#else
static inline void zylonite_pxa320_init(void)
extern void zylonite_pxa320_init(void);
#else
static inline void zylonite_pxa320_init(void)