From 3ee5050684013c5f8dab210cc89227db369f46dc Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 6 Apr 2013 01:06:03 +0200 Subject: backports: rename all patches to *.patch Also combine some that would otherwise have the same names (where .c and .h files with the same name exist) Signed-off-by: Johannes Berg --- .../network/09-threaded-irq/drivers_net_wireless_b43_b43.h | 12 ------------ .../09-threaded-irq/drivers_net_wireless_b43_b43.patch | 12 ++++++++++++ .../drivers_net_wireless_iwlwifi_pcie_internal.h | 12 ------------ .../drivers_net_wireless_iwlwifi_pcie_internal.patch | 12 ++++++++++++ .../09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h | 13 ------------- .../drivers_net_wireless_ti_wlcore_wlcore.patch | 13 +++++++++++++ 6 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h create mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch delete mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h create mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch delete mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h create mode 100644 patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch (limited to 'patches/collateral-evolutions/network/09-threaded-irq') diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h deleted file mode 100644 index 8889d233..00000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/b43/b43.h -+++ b/drivers/net/wireless/b43/b43.h -@@ -872,6 +872,9 @@ struct b43_wldev { - unsigned int tx_count; - unsigned int rx_count; - #endif -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - }; - - /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch new file mode 100644 index 00000000..8889d233 --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_b43.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/b43/b43.h ++++ b/drivers/net/wireless/b43/b43.h +@@ -872,6 +872,9 @@ struct b43_wldev { + unsigned int tx_count; + unsigned int rx_count; + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h deleted file mode 100644 index 3666d995..00000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.h +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/pcie/internal.h -+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -311,6 +311,9 @@ struct iwl_trans_pcie { - - /*protect hw register */ - spinlock_t reg_lock; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - }; - - /** diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch new file mode 100644 index 00000000..3666d995 --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/iwlwifi/pcie/internal.h ++++ b/drivers/net/wireless/iwlwifi/pcie/internal.h +@@ -311,6 +311,9 @@ struct iwl_trans_pcie { + + /*protect hw register */ + spinlock_t reg_lock; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + }; + + /** diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h deleted file mode 100644 index 67e0bc1a..00000000 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.h +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ti/wlcore/wlcore.h -+++ b/drivers/net/wireless/ti/wlcore/wlcore.h -@@ -175,7 +175,9 @@ struct wl1271 { - bool initialized; - struct ieee80211_hw *hw; - bool mac80211_registered; -- -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) -+ struct compat_threaded_irq irq_compat; -+#endif - struct device *dev; - struct platform_device *pdev; - diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch new file mode 100644 index 00000000..67e0bc1a --- /dev/null +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_wlcore.patch @@ -0,0 +1,13 @@ +--- a/drivers/net/wireless/ti/wlcore/wlcore.h ++++ b/drivers/net/wireless/ti/wlcore/wlcore.h +@@ -175,7 +175,9 @@ struct wl1271 { + bool initialized; + struct ieee80211_hw *hw; + bool mac80211_registered; +- ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) ++ struct compat_threaded_irq irq_compat; ++#endif + struct device *dev; + struct platform_device *pdev; + -- cgit v1.2.3