diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:17:54 -0500 |
| commit | 70ac551651a2c5a234b703d9a495817f2ca09639 (patch) | |
| tree | 71f55b9a3de438969a7a0d951971febf59784294 /include/asm-arm | |
| parent | 7f729ccff35befa08a836ab33a4372c7f6735645 (diff) | |
| parent | bd5d080ab99642e3245ef7cfa54490384c01d878 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/akita.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/akita.h b/include/asm-arm/arch-pxa/akita.h index 4a1fbcfccc39..5d8cc1d9cb10 100644 --- a/include/asm-arm/arch-pxa/akita.h +++ b/include/asm-arm/arch-pxa/akita.h | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | /* Default Values */ | 25 | /* Default Values */ |
| 26 | #define AKITA_IOEXP_IO_OUT (AKITA_IOEXP_IR_ON | AKITA_IOEXP_AKIN_PULLUP) | 26 | #define AKITA_IOEXP_IO_OUT (AKITA_IOEXP_IR_ON | AKITA_IOEXP_AKIN_PULLUP) |
| 27 | 27 | ||
| 28 | extern struct platform_device akitaioexp_device; | ||
| 29 | |||
| 28 | void akita_set_ioexp(struct device *dev, unsigned char bitmask); | 30 | void akita_set_ioexp(struct device *dev, unsigned char bitmask); |
| 29 | void akita_reset_ioexp(struct device *dev, unsigned char bitmask); | 31 | void akita_reset_ioexp(struct device *dev, unsigned char bitmask); |
| 30 | 32 | ||