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 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
colibri.h
diff --git
a/arch/arm/mach-pxa/include/mach/colibri.h
b/arch/arm/mach-pxa/include/mach/colibri.h
index
58dada1
..
388a96f
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/colibri.h
+++ b/
arch/arm/mach-pxa/include/mach/colibri.h
@@
-9,14
+9,14
@@
*/
enum {
*/
enum {
- COLIBRI_
PXA270_
EVALBOARD = 0,
+ COLIBRI_EVALBOARD = 0,
COLIBRI_PXA270_INCOME,
};
COLIBRI_PXA270_INCOME,
};
-#if defined(CONFIG_MACH_COLIBRI_
PXA270_
EVALBOARD)
-extern void colibri_
pxa270_
evalboard_init(void);
+#if defined(CONFIG_MACH_COLIBRI_EVALBOARD)
+extern void colibri_evalboard_init(void);
#else
#else
-static inline void colibri_
pxa270_
evalboard_init(void) {}
+static inline void colibri_evalboard_init(void) {}
#endif
#if defined(CONFIG_MACH_COLIBRI_PXA270_INCOME)
#endif
#if defined(CONFIG_MACH_COLIBRI_PXA270_INCOME)
@@
-59,5
+59,11
@@
static inline void colibri_pxa3xx_init_nand(void) {}
#define GPIO0_COLIBRI_PXA270_SD_DETECT 0
#define GPIO113_COLIBRI_PXA270_TS_IRQ 113
#define GPIO0_COLIBRI_PXA270_SD_DETECT 0
#define GPIO113_COLIBRI_PXA270_TS_IRQ 113
+/* GPIO definitions for Colibri PXA300/310 */
+#define GPIO39_COLIBRI_PXA300_SD_DETECT 39
+
+/* GPIO definitions for Colibri PXA320 */
+#define GPIO28_COLIBRI_PXA320_SD_DETECT 28
+
#endif /* _COLIBRI_H_ */
#endif /* _COLIBRI_H_ */