diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-12-09 23:29:52 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-12-09 23:29:52 +0000 |
| commit | 2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35 (patch) | |
| tree | f5238a4e0730e17906a9600ba2053405235779e0 /target/linux/generic/patches-3.14/025-bcma_backport.patch | |
| parent | 350c6a0435f03e916577ffe02ef3a98c3166b57e (diff) | |
| download | master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.tar.gz master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.tar.bz2 master-187ad058-2a2cefc30a135a4c4c9ba5877a12b4fa39cf5f35.zip | |
kernel: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43591 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/025-bcma_backport.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/025-bcma_backport.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/025-bcma_backport.patch b/target/linux/generic/patches-3.14/025-bcma_backport.patch index 436c1cf363..2791ce1bb6 100644 --- a/target/linux/generic/patches-3.14/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.14/025-bcma_backport.patch @@ -106,7 +106,7 @@ pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); readrq = pcie_get_readrq(dev); -@@ -617,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const +@@ -617,6 +617,6 @@ int bcma_core_pci_pcibios_map_irq(const pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host, pci_ops); @@ -983,7 +983,7 @@ +#endif /* LINUX_BCMA_DRIVER_PCIE2_H_ */ --- a/drivers/bcma/scan.c +++ b/drivers/bcma/scan.c -@@ -32,17 +32,17 @@ static const struct bcma_device_id_name +@@ -32,17 +32,17 @@ static const struct bcma_device_id_name { BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" }, { BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" }, { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" }, @@ -1290,7 +1290,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) { unsigned int oldirq = bcma_core_mips_irq(dev); -@@ -229,11 +230,51 @@ u32 bcma_cpu_clock(struct bcma_drv_mips +@@ -229,11 +230,51 @@ u32 bcma_cpu_clock(struct bcma_drv_mips } EXPORT_SYMBOL(bcma_cpu_clock); |