bcm53xx: refresh patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 44931
This commit is contained in:
parent
4f44df6fd8
commit
a4523c8e1d
@ -20,7 +20,7 @@ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
|||||||
index 2aaef7b..ca6c949 100644
|
index 2aaef7b..ca6c949 100644
|
||||||
--- a/drivers/watchdog/Kconfig
|
--- a/drivers/watchdog/Kconfig
|
||||||
+++ b/drivers/watchdog/Kconfig
|
+++ b/drivers/watchdog/Kconfig
|
||||||
@@ -1113,7 +1113,7 @@ config ATH79_WDT
|
@@ -1101,7 +1101,7 @@ config ATH79_WDT
|
||||||
|
|
||||||
config BCM47XX_WDT
|
config BCM47XX_WDT
|
||||||
tristate "Broadcom BCM47xx Watchdog Timer"
|
tristate "Broadcom BCM47xx Watchdog Timer"
|
||||||
|
@ -92,7 +92,7 @@ diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadc
|
|||||||
index 34c7bc8..943707f 100644
|
index 34c7bc8..943707f 100644
|
||||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||||||
@@ -17,7 +17,7 @@
|
@@ -18,7 +18,7 @@
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/platform_data/b53.h>
|
#include <linux/platform_data/b53.h>
|
||||||
|
@ -15,7 +15,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
|
|
||||||
--- a/drivers/pci/probe.c
|
--- a/drivers/pci/probe.c
|
||||||
+++ b/drivers/pci/probe.c
|
+++ b/drivers/pci/probe.c
|
||||||
@@ -2097,7 +2097,10 @@ struct pci_bus *pci_scan_root_bus(struct
|
@@ -2100,7 +2100,10 @@ struct pci_bus *pci_scan_root_bus(struct
|
||||||
if (!found)
|
if (!found)
|
||||||
pci_bus_update_busn_res_end(b, max);
|
pci_bus_update_busn_res_end(b, max);
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
|
|
||||||
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
||||||
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
||||||
@@ -79,7 +79,10 @@ static const char __initconst *bcm5301x_
|
@@ -49,7 +49,10 @@ static const char __initconst *bcm5301x_
|
||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(BCM5301X, "BCM5301X")
|
DT_MACHINE_START(BCM5301X, "BCM5301X")
|
||||||
@ -25,4 +25,4 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|||||||
+ L310_AUX_CTRL_EARLY_BRESP,
|
+ L310_AUX_CTRL_EARLY_BRESP,
|
||||||
.l2c_aux_mask = ~0,
|
.l2c_aux_mask = ~0,
|
||||||
.init_early = bcm5301x_init_early,
|
.init_early = bcm5301x_init_early,
|
||||||
.restart = bcm5301x_restart,
|
.dt_compat = bcm5301x_dt_compat,
|
||||||
|
@ -61,7 +61,7 @@ index 0000000..2d7e388
|
|||||||
+};
|
+};
|
||||||
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
--- a/arch/arm/mach-bcm/bcm_5301x.c
|
||||||
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
+++ b/arch/arm/mach-bcm/bcm_5301x.c
|
||||||
@@ -35,15 +35,16 @@ static struct bcma_bus *bcm5301x_get_bcm
|
@@ -18,15 +18,16 @@ static bool first_fault = true;
|
||||||
static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
|
static int bcm5301x_abort_handler(unsigned long addr, unsigned int fsr,
|
||||||
struct pt_regs *regs)
|
struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user