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 branch 'samsung/driver' into next/drivers
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
corgi.c
diff --git
a/arch/arm/mach-pxa/corgi.c
b/arch/arm/mach-pxa/corgi.c
index
9d4dc59
..
66600f0
100644
(file)
--- a/
arch/arm/mach-pxa/corgi.c
+++ b/
arch/arm/mach-pxa/corgi.c
@@
-531,7
+531,7
@@
static struct spi_board_info corgi_spi_devices[] = {
.chip_select = 0,
.platform_data = &corgi_ads7846_info,
.controller_data= &corgi_ads7846_chip,
- .irq =
gpio_to_irq
(CORGI_GPIO_TP_INT),
+ .irq =
PXA_GPIO_TO_IRQ
(CORGI_GPIO_TP_INT),
}, {
.modalias = "corgi-lcd",
.max_speed_hz = 50000,