diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:14:59 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-12 00:14:59 +0200 |
| commit | 4acd4da998e71c681f7030f9706abda055f95ccc (patch) | |
| tree | c4e36c8bff97c48764ac93ae46a84b70a79072d6 /target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | |
| parent | 9c840109de4494b3ecc29917090deb13518338ad (diff) | |
| download | master-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.tar.gz master-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.tar.bz2 master-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.zip | |
Revert "kernel: bump 3.18 to 3.18.39"
Stay on 3.18.36
This reverts commit 83767cf94f909f5932540da7641a12b7dfa71d85.
Diffstat (limited to 'target/linux/generic/patches-3.18/026-bcma-from-3.20.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch index 628b0bd389..17c06b001f 100644 --- a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch +++ b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -23,22 +23,18 @@ struct bcma_bus; +@@ -25,22 +25,18 @@ struct bcma_bus; bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value, int timeout); void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core); @@ -26,7 +26,7 @@ /* sprom.c */ int bcma_sprom_get(struct bcma_bus *bus); -@@ -109,6 +105,14 @@ extern int bcma_chipco_watchdog_register +@@ -111,6 +107,14 @@ extern int bcma_chipco_watchdog_register #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc); void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); @@ -467,7 +467,7 @@ if (!bus->drv_cc.core) --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -319,6 +319,7 @@ struct bcma_bus { +@@ -318,6 +318,7 @@ struct bcma_bus { const struct bcma_host_ops *ops; enum bcma_hosttype hosttype; |