diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 10:36:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 10:36:25 +0000 |
| commit | 1f7f569c0ae6e619504095eabf796edd712d943d (patch) | |
| tree | ee7b579923772699a326626d570cff5ecb94a7af /arch/arm/mach-pxa/include/mach | |
| parent | a02f45cfca97dcf97c03b32603ec2399bf006605 (diff) | |
| parent | e38a9707d8d94de86fe84109fa6823ddc969721a (diff) | |
| download | blackbird-obmc-linux-1f7f569c0ae6e619504095eabf796edd712d943d.tar.gz blackbird-obmc-linux-1f7f569c0ae6e619504095eabf796edd712d943d.zip | |
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/eseries-gpio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/eseries-gpio.h b/arch/arm/mach-pxa/include/mach/eseries-gpio.h index 4c90b1310270..efbd2aa9ecec 100644 --- a/arch/arm/mach-pxa/include/mach/eseries-gpio.h +++ b/arch/arm/mach-pxa/include/mach/eseries-gpio.h @@ -43,8 +43,10 @@ #define GPIO_E800_PCMCIA_PWR1 73 /* e7xx IrDA power control */ -#define GPIO_E7XX_IR_ON 38 +#define GPIO_E7XX_IR_OFF 38 /* ASIC related GPIOs */ #define GPIO_ESERIES_TMIO_IRQ 5 +#define GPIO_ESERIES_TMIO_PCLR 19 +#define GPIO_ESERIES_TMIO_SUSPEND 45 #define GPIO_E800_ANGELX_IRQ 8 |
