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 v2.6.37-rc8 into powerpc/next
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
balloon3.h
diff --git
a/arch/arm/mach-pxa/include/mach/balloon3.h
b/arch/arm/mach-pxa/include/mach/balloon3.h
index
eec92e6
..
561562b
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/
arch/arm/mach-pxa/include/mach/balloon3.h
@@
-174,6
+174,8
@@
enum balloon3_features {
#define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
#define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD)
+#define BALLOON3_NR_IRQS (IRQ_BOARD_START + 4)
+
extern int balloon3_has(enum balloon3_features feature);
#endif