diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-31 21:45:30 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-31 21:45:30 +0000 |
| commit | 94ffdca114fc26330afca64eceb8a6726186fbc1 (patch) | |
| tree | 08950f6ca96b8ff56edda6ef40314ecc0f913e93 /target/linux | |
| parent | e2a056ae6596ecc017ab6acd337d5fa18470d9bd (diff) | |
[ar7] refresh 2.6.32 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23745 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ar7/patches-2.6.32/160-vlynq_try_remote_first.patch | 6 | ||||
| -rw-r--r-- | target/linux/ar7/patches-2.6.32/930-titan-platform.patch | 4 |
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) +{ |