diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/arm/mach-pxa/treo680.c | |
| parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'arch/arm/mach-pxa/treo680.c')
| -rw-r--r-- | arch/arm/mach-pxa/treo680.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/treo680.c b/arch/arm/mach-pxa/treo680.c index a06f19edebb3..753ec4df17b9 100644 --- a/arch/arm/mach-pxa/treo680.c +++ b/arch/arm/mach-pxa/treo680.c | |||
| @@ -409,7 +409,7 @@ err1: | |||
| 409 | 409 | ||
| 410 | static void treo680_irda_shutdown(struct device *dev) | 410 | static void treo680_irda_shutdown(struct device *dev) |
| 411 | { | 411 | { |
| 412 | gpio_free(GPIO_NR_TREO680_AMP_EN); | 412 | gpio_free(GPIO_NR_TREO680_IR_EN); |
| 413 | } | 413 | } |
| 414 | 414 | ||
| 415 | static struct pxaficp_platform_data treo680_ficp_info = { | 415 | static struct pxaficp_platform_data treo680_ficp_info = { |