Changeset 29129


Ignore:
Timestamp:
2011-11-14T19:55:58+01:00 (5 years ago)
Author:
blogic
Message:

lantiq: fix falcon build breakage

dev-wifi-rt2x00 fails to build on falcon due to missing pci

Location:
trunk/target/linux/lantiq
Files:
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/files-3.1/arch/mips/lantiq/xway/mach-arv45xx.c

    r29002 r29129  
    2626 
    2727#include "../machtypes.h" 
    28 #include "../dev-wifi-rt2x00.h" 
     28#include "dev-wifi-rt2x00.h" 
    2929#include "devices.h" 
    3030#include "dev-dwc_otg.h" 
  • trunk/target/linux/lantiq/patches/211-devices.patch

    r29007 r29129  
    1 --- a/arch/mips/lantiq/devices.c 
    2 +++ b/arch/mips/lantiq/devices.c 
     1Index: linux-3.1.1/arch/mips/lantiq/devices.c 
     2=================================================================== 
     3--- linux-3.1.1.orig/arch/mips/lantiq/devices.c 2011-11-14 20:22:33.588135463 +0100 
     4+++ linux-3.1.1/arch/mips/lantiq/devices.c      2011-11-14 20:22:34.328135495 +0100 
    35@@ -18,6 +18,7 @@ 
    46 #include <linux/time.h> 
     
    911 #include <asm/bootinfo.h> 
    1012 #include <asm/irq.h> 
    11 @@ -100,3 +101,20 @@ void __init ltq_register_pci(struct ltq_ 
     13@@ -100,3 +101,20 @@ 
    1214        pr_err("kernel is compiled without PCI support\n"); 
    1315 } 
     
    3032+               (void*)CPHYSADDR(dma_alloc_coherent(NULL, CP1_SIZE, &dma, GFP_ATOMIC)); 
    3133+} 
    32 --- a/arch/mips/lantiq/devices.h 
    33 +++ b/arch/mips/lantiq/devices.h 
    34 @@ -23,5 +23,6 @@ extern void ltq_register_nor(struct phys 
     34Index: linux-3.1.1/arch/mips/lantiq/devices.h 
     35=================================================================== 
     36--- linux-3.1.1.orig/arch/mips/lantiq/devices.h 2011-11-14 20:22:33.588135463 +0100 
     37+++ linux-3.1.1/arch/mips/lantiq/devices.h      2011-11-14 20:22:34.328135495 +0100 
     38@@ -23,5 +23,6 @@ 
    3539 extern void ltq_register_wdt(void); 
    3640 extern void ltq_register_asc(int port); 
     
    3943  
    4044 #endif 
    41 --- a/arch/mips/lantiq/xway/Makefile 
    42 +++ b/arch/mips/lantiq/xway/Makefile 
     45Index: linux-3.1.1/arch/mips/lantiq/xway/Makefile 
     46=================================================================== 
     47--- linux-3.1.1.orig/arch/mips/lantiq/xway/Makefile     2011-11-14 20:22:34.304135491 +0100 
     48+++ linux-3.1.1/arch/mips/lantiq/xway/Makefile  2011-11-14 20:39:51.404179655 +0100 
    4349@@ -1,5 +1,7 @@ 
    4450 obj-y := sysctrl.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o nand.o timer.o 
    4551  
    46 +obj-y += dev-dwc_otg.o 
     52+obj-y += dev-dwc_otg.o dev-wifi-rt2x00.o 
    4753+ 
    4854 obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o 
    4955 obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o 
    5056 obj-$(CONFIG_SOC_VR9) += clk-vr9.o prom-vr9.o 
    51 --- a/arch/mips/lantiq/xway/devices.c 
    52 +++ b/arch/mips/lantiq/xway/devices.c 
     57Index: linux-3.1.1/arch/mips/lantiq/xway/devices.c 
     58=================================================================== 
     59--- linux-3.1.1.orig/arch/mips/lantiq/xway/devices.c    2011-11-14 20:22:34.092135483 +0100 
     60+++ linux-3.1.1/arch/mips/lantiq/xway/devices.c 2011-11-14 20:22:34.328135495 +0100 
    5361@@ -19,6 +19,7 @@ 
    5462 #include <linux/time.h> 
     
    5967 #include <asm/bootinfo.h> 
    6068 #include <asm/irq.h> 
    61 @@ -99,3 +100,98 @@ ltq_register_etop(struct ltq_eth_data *e 
     69@@ -99,3 +100,98 @@ 
    6270                platform_device_register(&ltq_etop); 
    6371        } 
     
    158166+       platform_device_register(&ltq_spi); 
    159167+} 
    160 --- a/arch/mips/lantiq/xway/devices.h 
    161 +++ b/arch/mips/lantiq/xway/devices.h 
     168Index: linux-3.1.1/arch/mips/lantiq/xway/devices.h 
     169=================================================================== 
     170--- linux-3.1.1.orig/arch/mips/lantiq/xway/devices.h    2011-11-11 21:19:27.000000000 +0100 
     171+++ linux-3.1.1/arch/mips/lantiq/xway/devices.h 2011-11-14 20:22:34.328135495 +0100 
    162172@@ -11,10 +11,17 @@ 
    163173  
     
    178188  
    179189 #endif 
    180 --- a/arch/mips/lantiq/Makefile 
    181 +++ b/arch/mips/lantiq/Makefile 
     190Index: linux-3.1.1/arch/mips/lantiq/Makefile 
     191=================================================================== 
     192--- linux-3.1.1.orig/arch/mips/lantiq/Makefile  2011-11-14 20:22:33.640135462 +0100 
     193+++ linux-3.1.1/arch/mips/lantiq/Makefile       2011-11-14 20:39:09.852178049 +0100 
    182194@@ -4,7 +4,7 @@ 
    183195 # under the terms of the GNU General Public License version 2 as published 
     
    185197  
    186198-obj-y := irq.o setup.o clk.o prom.o devices.o 
    187 +obj-y := irq.o setup.o clk.o prom.o devices.o dev-gpio-leds.o dev-gpio-buttons.o dev-wifi-rt2x00.o 
     199+obj-y := irq.o setup.o clk.o prom.o devices.o dev-gpio-leds.o dev-gpio-buttons.o 
    188200  
    189201 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
Note: See TracChangeset for help on using the changeset viewer.