diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-10-31 13:10:49 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-10-31 13:10:49 +0000 |
| commit | 56eaf842c7bb55519b15e0cd0411948e9ad18f42 (patch) | |
| tree | 00fd7e3f020cfbea79ae332d1ff781809c5f410c /target/linux/ar7/patches-2.6.32/930-titan-platform.patch | |
| parent | a621fdb419bc36189818fd0791a15664c4359a46 (diff) | |
| download | upstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.tar.gz upstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.tar.bz2 upstream-56eaf842c7bb55519b15e0cd0411948e9ad18f42.zip | |
refresh 2.6.32 patches
SVN-Revision: 23736
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/930-titan-platform.patch')
| -rw-r--r-- | target/linux/ar7/patches-2.6.32/930-titan-platform.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 cf6966dd10..21b585b169 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 @@ -1,6 +1,6 @@ --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c -@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] +@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] }, }; @@ -37,7 +37,7 @@ static struct resource vlynq_low_res[] = { { .name = "regs", -@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] +@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] }, }; @@ -192,7 +192,7 @@ static struct gpio_led default_leds[] = { { -@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = +@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = }, }; @@ -329,9 +329,9 @@ /* Interrupts */ #define AR7_IRQ_UART0 15 -@@ -95,14 +115,22 @@ struct plat_dsl_data { +@@ -97,14 +117,22 @@ extern int ar7_cpu_clock, ar7_bus_clock, - extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock; + extern void __init ar7_init_clocks(void); +static inline int ar7_is_titan(void) +{ |