From 0d3690a202894a87e4cb1a1ba7542917f0b29a8d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 22 Jul 2014 21:40:41 +0000 Subject: kernel: update bcma and ssb to version master-2014-07-22 This is a backport of bcma and ssb from wireless-tesing/master tag master-2014-07-22. Signed-off-by: Hauke Mehrtens SVN-Revision: 41804 --- .../patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/bcm53xx/patches-3.14/120-bcma-register-bcma-as-device-tree-driver.patch') 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 d885c5c4e8..5b4a79ea51 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 +#endif /* CONFIG_OF */ --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -319,6 +319,8 @@ struct bcma_bus { +@@ -322,6 +322,8 @@ struct bcma_bus { struct pci_dev *host_pci; /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */ struct sdio_func *host_sdio; -- cgit v1.2.3