diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /arch/arm/mach-pxa/poodle.c | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'arch/arm/mach-pxa/poodle.c')
| -rw-r--r-- | arch/arm/mach-pxa/poodle.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 0b30f25cff3c..39612cfa0b4d 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
| 33 | 33 | ||
| 34 | #include <asm/arch/pxa-regs.h> | 34 | #include <asm/arch/pxa-regs.h> |
| 35 | #include <asm/arch/pxa2xx-regs.h> | ||
| 35 | #include <asm/arch/pxa2xx-gpio.h> | 36 | #include <asm/arch/pxa2xx-gpio.h> |
| 36 | #include <asm/arch/mmc.h> | 37 | #include <asm/arch/mmc.h> |
| 37 | #include <asm/arch/udc.h> | 38 | #include <asm/arch/udc.h> |
| @@ -266,6 +267,7 @@ static void poodle_irda_transceiver_mode(struct device *dev, int mode) | |||
| 266 | } else { | 267 | } else { |
| 267 | GPCR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON); | 268 | GPCR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON); |
| 268 | } | 269 | } |
| 270 | pxa2xx_transceiver_mode(dev, mode); | ||
| 269 | } | 271 | } |
| 270 | 272 | ||
| 271 | static struct pxaficp_platform_data poodle_ficp_platform_data = { | 273 | static struct pxaficp_platform_data poodle_ficp_platform_data = { |