summaryrefslogtreecommitdiff
path: root/patches/0069-remove-of_irq
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-09-24 12:51:38 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-09-24 12:52:02 +0200
commit7b6e1a148f38bab62a35fc6ff22b6f2feaba445b (patch)
tree0ddfc61d1db66767e924ea3fac903f065d4d3c01 /patches/0069-remove-of_irq
parent9e0c8ce615ca019dafd1c0e087809e97d913a229 (diff)
Revert "backports: Remove ssb and bcma"
This reverts commit 1b4e6ad4d927c7998fa578f2d29e0c4ec01a9217. Said commit broke b43 on older kernels (<3.16). Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0069-remove-of_irq')
-rw-r--r--patches/0069-remove-of_irq/bcma.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/0069-remove-of_irq/bcma.patch b/patches/0069-remove-of_irq/bcma.patch
new file mode 100644
index 00000000..b8a05ae8
--- /dev/null
+++ b/patches/0069-remove-of_irq/bcma.patch
@@ -0,0 +1,24 @@
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -156,6 +156,7 @@ static struct device_node *bcma_of_find_
+ return NULL;
+ }
+
++#if LINUX_VERSION_IS_GEQ(3,13,0)
+ static int bcma_of_irq_parse(struct device *parent,
+ struct bcma_device *core,
+ struct of_phandle_args *out_irq, int num)
+@@ -195,6 +196,13 @@ static unsigned int bcma_of_get_irq(stru
+
+ return irq_create_of_mapping(&out_irq);
+ }
++#else
++static unsigned int bcma_of_get_irq(struct device *parent,
++ struct bcma_device *core, int num)
++{
++ return 0;
++}
++#endif
+
+ static void bcma_of_fill_device(struct device *parent,
+ struct bcma_device *core)