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 commit 'origin/x86/urgent' into x86/asm
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
treo680.c
diff --git
a/arch/arm/mach-pxa/treo680.c
b/arch/arm/mach-pxa/treo680.c
index
a06f19e
..
753ec4d
100644
(file)
--- a/
arch/arm/mach-pxa/treo680.c
+++ b/
arch/arm/mach-pxa/treo680.c
@@
-409,7
+409,7
@@
err1:
static void treo680_irda_shutdown(struct device *dev)
{
- gpio_free(GPIO_NR_TREO680_
AMP
_EN);
+ gpio_free(GPIO_NR_TREO680_
IR
_EN);
}
static struct pxaficp_platform_data treo680_ficp_info = {