OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 9... Line 9...
9 Signed-off-by: Rafał Miłecki <rafal@milecki.pl> 9 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
10 --- 10 ---
Line 11... Line 11...
11   11  
12 --- a/arch/arm/boot/dts/bcm53573.dtsi 12 --- a/arch/arm/boot/dts/bcm53573.dtsi
13 +++ b/arch/arm/boot/dts/bcm53573.dtsi 13 +++ b/arch/arm/boot/dts/bcm53573.dtsi
14 @@ -53,6 +53,7 @@ 14 @@ -54,6 +54,7 @@
15 <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, 15 <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
16 <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, 16 <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
17 <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; 17 <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
18 + clocks = <&ilp>; 18 + clocks = <&ilp>;
Line 19... Line 19...
19 }; 19 };
20 20
21 clocks { 21 clocks {
22 --- a/drivers/bcma/main.c 22 --- a/drivers/bcma/main.c
23 +++ b/drivers/bcma/main.c 23 +++ b/drivers/bcma/main.c
24 @@ -326,14 +326,6 @@ static int bcma_register_devices(struct 24 @@ -348,14 +348,6 @@ static int bcma_register_devices(struct
Line 25... Line 25...
25 } 25 }
26 #endif 26 #endif
Line 34... Line 34...
34 -#endif 34 -#endif
35 - 35 -
36 #ifdef CONFIG_BCMA_NFLASH 36 #ifdef CONFIG_BCMA_NFLASH
37 if (bus->drv_cc.nflash.present) { 37 if (bus->drv_cc.nflash.present) {
38 err = platform_device_register(&bcma_nflash_dev); 38 err = platform_device_register(&bcma_nflash_dev);
39 @@ -411,6 +403,14 @@ int bcma_bus_register(struct bcma_bus *b 39 @@ -436,6 +428,14 @@ int bcma_bus_register(struct bcma_bus *b
40 bcma_register_core(bus, core); 40 bcma_register_core(bus, core);
41 } 41 }
Line 42... Line 42...
42 42
43 +#ifdef CONFIG_BCMA_SFLASH 43 +#ifdef CONFIG_BCMA_SFLASH