aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-17 12:50:54 +0000
commit23578461a92aca344eb5d34d59352da3163281a8 (patch)
tree7884a0e5485ce8383b2b63163b38e40ea60ffb3c /target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch
parentd52ae4d7d3a8335fb68ebaf53ad52e8586e8e29b (diff)
downloadupstream-23578461a92aca344eb5d34d59352da3163281a8.tar.gz
upstream-23578461a92aca344eb5d34d59352da3163281a8.tar.bz2
upstream-23578461a92aca344eb5d34d59352da3163281a8.zip
kernel: update linux 3.2 to 3.2.15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch
index c7f2928b34..6440890788 100644
--- a/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch
+++ b/target/linux/lantiq/patches-3.2/0029-MIPS-lantiq-convert-falcon-gpio-to-clkdev-api.patch
@@ -12,8 +12,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
arch/mips/lantiq/falcon/gpio.c | 10 ++++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
-diff --git a/arch/mips/lantiq/falcon/devices.c b/arch/mips/lantiq/falcon/devices.c
-index 4f47b44..6cd7a88 100644
--- a/arch/mips/lantiq/falcon/devices.c
+++ b/arch/mips/lantiq/falcon/devices.c
@@ -111,9 +111,6 @@ falcon_register_gpio(void)
@@ -33,8 +31,6 @@ index 4f47b44..6cd7a88 100644
- ltq_sysctl_activate(SYSCTL_SYS1,
- ACTS_PADCTRL3 | ACTS_PADCTRL4 | ACTS_P3 | ACTS_P4);
}
-diff --git a/arch/mips/lantiq/falcon/gpio.c b/arch/mips/lantiq/falcon/gpio.c
-index a44f71b..4147d61 100644
--- a/arch/mips/lantiq/falcon/gpio.c
+++ b/arch/mips/lantiq/falcon/gpio.c
@@ -11,6 +11,7 @@
@@ -53,7 +49,7 @@ index a44f71b..4147d61 100644
};
static struct falcon_gpio_port ltq_gpio_port[MAX_PORTS];
-@@ -332,6 +334,14 @@ falcon_gpio_probe(struct platform_device *pdev)
+@@ -332,6 +334,14 @@ falcon_gpio_probe(struct platform_device
goto err;
}
@@ -68,6 +64,3 @@ index a44f71b..4147d61 100644
if (irq > 0) {
/* irq_chip support */
gpio_port->gpio_chip.to_irq = falcon_gpio_to_irq;
---
-1.7.9.1
-