aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-10-31 21:45:30 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-10-31 21:45:30 +0000
commit32ec735d8a3e541732683565334bed050b24a5de (patch)
tree3259789f5bdc734f1541b4f53122996987ee7613 /target/linux/ar7/patches-2.6.32
parent97b3d9688c1ac172441d497a019e59a1bd8415f5 (diff)
downloadupstream-32ec735d8a3e541732683565334bed050b24a5de.tar.gz
upstream-32ec735d8a3e541732683565334bed050b24a5de.tar.bz2
upstream-32ec735d8a3e541732683565334bed050b24a5de.zip
refresh 2.6.32 patches
SVN-Revision: 23745
Diffstat (limited to 'target/linux/ar7/patches-2.6.32')
-rw-r--r--target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch6
-rw-r--r--target/linux/ar7/patches-2.6.32/930-titan-platform.patch4
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch b/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch
index b1adb6fc6e..437bc89d93 100644
--- a/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch
+++ b/target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch
@@ -1,6 +1,6 @@
---- a/drivers/vlynq/vlynq.c 2010-08-02 00:11:14.000000000 +0200
-+++ b/drivers/vlynq/vlynq.c 2010-10-17 15:49:36.215058054 +0200
-@@ -515,9 +515,14 @@
+--- a/drivers/vlynq/vlynq.c
++++ b/drivers/vlynq/vlynq.c
+@@ -514,9 +514,14 @@ static int __vlynq_enable_device(struct
!__vlynq_try_external(dev))
return 0;
} else {
diff --git a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
index 21b585b169..2678876ba4 100644
--- a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
+++ b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
@@ -329,9 +329,9 @@
/* Interrupts */
#define AR7_IRQ_UART0 15
-@@ -97,14 +117,22 @@ extern int ar7_cpu_clock, ar7_bus_clock,
+@@ -95,14 +115,22 @@ struct plat_dsl_data {
- extern void __init ar7_init_clocks(void);
+ extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock;
+static inline int ar7_is_titan(void)
+{