diff options
| author | John Crispin <blogic@openwrt.org> | 2015-03-11 17:08:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-03-11 17:08:46 +0000 |
| commit | 41afbc70a7d406a115a2e65e11432513ceefed5c (patch) | |
| tree | da09d268245b0b74ea92d7c3482a14a49642eceb /target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | |
| parent | 2c0cefef77fd89697cbb281cd3eccc4c4bd24ef2 (diff) | |
| download | upstream-41afbc70a7d406a115a2e65e11432513ceefed5c.tar.gz upstream-41afbc70a7d406a115a2e65e11432513ceefed5c.tar.bz2 upstream-41afbc70a7d406a115a2e65e11432513ceefed5c.zip | |
kenrel: refresh patches
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44678 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index 3854d3a6bd..04c2071f32 100644 --- a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -30,7 +30,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +#endif /* _PCI_ATH_FIXUP */ --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h -@@ -90,5 +90,8 @@ +@@ -90,5 +90,8 @@ int xrx200_gphy_boot(struct device *dev, extern void ltq_pmu_enable(unsigned int module); extern void ltq_pmu_disable(unsigned int module); @@ -41,7 +41,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> #endif /* _LTQ_XWAY_H__ */ --- a/arch/mips/lantiq/xway/Makefile +++ b/arch/mips/lantiq/xway/Makefile -@@ -2,4 +2,7 @@ +@@ -2,4 +2,7 @@ obj-y := prom.o sysctrl.o clk.o reset.o obj-y += vmmc.o tffs.o @@ -590,7 +590,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> +device_initcall(of_ralink_eeprom_init); --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c -@@ -161,7 +161,7 @@ +@@ -161,7 +161,7 @@ struct ltq_etop_priv { int tx_irq; int rx_irq; @@ -599,7 +599,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> int mii_mode; spinlock_t lock; -@@ -840,7 +840,11 @@ +@@ -840,7 +840,11 @@ ltq_etop_init(struct net_device *dev) if (err) goto err_hw; |