diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-31 21:44:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-31 21:44:41 +0000 |
commit | 69c403c234c1c9e1a06c719135e9396815a3b756 (patch) | |
tree | 48eb19158cb134a80bec52e00f3283235bddfcb8 /target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch | |
parent | 350765676e657e8b2fb7e8cd794cbfa88dad52dc (diff) | |
download | upstream-69c403c234c1c9e1a06c719135e9396815a3b756.tar.gz upstream-69c403c234c1c9e1a06c719135e9396815a3b756.tar.bz2 upstream-69c403c234c1c9e1a06c719135e9396815a3b756.zip |
bcm53xx: update to kernel 3.14
Use kernel 3.14 by default and refresh the patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 41913
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch index 5b4a79ea51..0db670a619 100644 --- a/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch +++ b/target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch @@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +#endif /* CONFIG_OF */ --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -322,6 +322,8 @@ struct bcma_bus { +@@ -323,6 +323,8 @@ struct bcma_bus { struct pci_dev *host_pci; /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */ struct sdio_func *host_sdio; |