summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-3.10
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10')
-rw-r--r--target/linux/brcm47xx/patches-3.10/241-bcma-broadcom-2011-sdk-updates.patch10
-rw-r--r--target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch4
2 files changed, 2 insertions, 12 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/241-bcma-broadcom-2011-sdk-updates.patch b/target/linux/brcm47xx/patches-3.10/241-bcma-broadcom-2011-sdk-updates.patch
deleted file mode 100644
index 72b02088c6..0000000000
--- a/target/linux/brcm47xx/patches-3.10/241-bcma-broadcom-2011-sdk-updates.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/bcma/core.c
-+++ b/drivers/bcma/core.c
-@@ -43,6 +43,7 @@ int bcma_core_enable(struct bcma_device
- bcma_aread32(core, BCMA_IOCTL);
-
- bcma_awrite32(core, BCMA_RESET_CTL, 0);
-+ bcma_aread32(core, BCMA_RESET_CTL);
- udelay(1);
-
- bcma_awrite32(core, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));
diff --git a/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
index c4382ed514..aabaf29471 100644
--- a/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
+++ b/target/linux/brcm47xx/patches-3.10/280-activate_ssb_support_in_usb.patch
@@ -5,7 +5,7 @@ This prevents the options from being delete with make kernel_oldconfig.
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
-@@ -37,6 +37,7 @@ config BCMA_DRIVER_PCI_HOSTMODE
+@@ -38,6 +38,7 @@ config BCMA_DRIVER_PCI_HOSTMODE
config BCMA_HOST_SOC
bool
depends on BCMA_DRIVER_MIPS
@@ -18,7 +18,7 @@ This prevents the options from being delete with make kernel_oldconfig.
@@ -146,6 +146,7 @@ config SSB_SFLASH
config SSB_EMBEDDED
bool
- depends on SSB_DRIVER_MIPS
+ depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
+ select USB_HCD_SSB if USB_EHCI_HCD || USB_OHCI_HCD
default y