From 51062f0814dbc2dc1aeadb9a674a4ef836c6dd0b Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 30 Mar 2010 21:24:08 +0000 Subject: mac80211: enable building of the rt2800 on the ramips target git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20615 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/015-remove-rt2x00-options.patch | 26 ++++++++++++++++++++++ ...isable-pci-code-if-CONFIG_PCI-not-defined.patch | 18 +++++++++++++++ .../patches/601-rt2x00-lib-use-rt2x00dev-irq.patch | 11 +++++++++ 3 files changed, 55 insertions(+) create mode 100644 package/mac80211/patches/015-remove-rt2x00-options.patch create mode 100644 package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch create mode 100644 package/mac80211/patches/601-rt2x00-lib-use-rt2x00dev-irq.patch (limited to 'package/mac80211/patches') diff --git a/package/mac80211/patches/015-remove-rt2x00-options.patch b/package/mac80211/patches/015-remove-rt2x00-options.patch new file mode 100644 index 0000000000..f980979cc5 --- /dev/null +++ b/package/mac80211/patches/015-remove-rt2x00-options.patch @@ -0,0 +1,26 @@ +--- a/config.mk ++++ b/config.mk +@@ -276,12 +276,12 @@ CONFIG_RTL8180=m + + CONFIG_ADM8211=m + +-CONFIG_RT2X00_LIB_PCI=m ++# CONFIG_RT2X00_LIB_PCI=m + CONFIG_RT2400PCI=m + CONFIG_RT2500PCI=m + ifneq ($(CONFIG_CRC_CCITT),) + CONFIG_RT2800PCI=m +-CONFIG_RT2800PCI_PCI=y ++# CONFIG_RT2800PCI_PCI=y + # CONFIG_RT2800PCI_RT30XX=y + # CONFIG_RT2800PCI_RT35XX=y + # CONFIG_RT2800PCI_SOC=y +@@ -381,7 +381,7 @@ CONFIG_RT2800USB=m + # CONFIG_RT2800USB_RT35XX=y + # CONFIG_RT2800USB_UNKNOWN=y + endif +-CONFIG_RT2X00_LIB_USB=m ++# CONFIG_RT2X00_LIB_USB=m + NEED_RT2X00=y + # RT73USB requires firmware + ifneq ($(CONFIG_CRC_ITU_T),) diff --git a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch new file mode 100644 index 0000000000..3971413b0d --- /dev/null +++ b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch @@ -0,0 +1,18 @@ +--- a/drivers/net/wireless/rt2x00/rt2x00pci.c ++++ b/drivers/net/wireless/rt2x00/rt2x00pci.c +@@ -223,6 +223,7 @@ void rt2x00pci_uninitialize(struct rt2x0 + } + EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize); + ++#ifdef CONFIG_PCI + /* + * PCI driver handlers. + */ +@@ -397,6 +398,7 @@ int rt2x00pci_resume(struct pci_dev *pci + } + EXPORT_SYMBOL_GPL(rt2x00pci_resume); + #endif /* CONFIG_PM */ ++#endif /* CONFIG_PCI */ + + /* + * rt2x00pci module information. diff --git a/package/mac80211/patches/601-rt2x00-lib-use-rt2x00dev-irq.patch b/package/mac80211/patches/601-rt2x00-lib-use-rt2x00dev-irq.patch new file mode 100644 index 0000000000..22bfc2ebe5 --- /dev/null +++ b/package/mac80211/patches/601-rt2x00-lib-use-rt2x00dev-irq.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/rt2x00/rt2x00pci.c ++++ b/drivers/net/wireless/rt2x00/rt2x00pci.c +@@ -213,7 +213,7 @@ void rt2x00pci_uninitialize(struct rt2x0 + /* + * Free irq line. + */ +- free_irq(to_pci_dev(rt2x00dev->dev)->irq, rt2x00dev); ++ free_irq(rt2x00dev->irq, rt2x00dev); + + /* + * Free DMA -- cgit v1.2.3