projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
magician.c
diff --git
a/arch/arm/mach-pxa/magician.c
b/arch/arm/mach-pxa/magician.c
index
265f48b
..
b413e36
100644
(file)
--- a/
arch/arm/mach-pxa/magician.c
+++ b/
arch/arm/mach-pxa/magician.c
@@
-121,10
+121,6
@@
static unsigned long magician_pin_config[] __initdata = {
GPIO107_GPIO, /* DS1WM_IRQ */
GPIO108_GPIO, /* GSM_READY */
GPIO115_GPIO, /* nPEN_IRQ */
-
- /* I2C */
- GPIO117_I2C_SCL,
- GPIO118_I2C_SDA,
};
/*