+++ /dev/null
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -15,41 +15,41 @@
- drm_trace_points.o drm_global.o drm_prime.o
-
- drm-$(CONFIG_COMPAT) += drm_ioc32.o
--drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
-+drm-$(CONFIG_COMPAT_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
- drm-$(CONFIG_PCI) += ati_pcigart.o
-
- drm-usb-y := drm_usb.o
-
- drm_kms_helper-y := drm_fb_helper.o drm_crtc_helper.o drm_dp_helper.o
--drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
--drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
-+drm_kms_helper-$(CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o
-+drm_kms_helper-$(CONFIG_COMPAT_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
-
--obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
-+obj-$(CONFIG_COMPAT_DRM_KMS_HELPER) += drm_kms_helper.o
-
- CFLAGS_drm_trace_points.o := -I$(src)
-
--obj-$(CONFIG_DRM) += drm.o
--obj-$(CONFIG_DRM_USB) += drm_usb.o
--obj-$(CONFIG_DRM_TTM) += ttm/
--obj-$(CONFIG_DRM_TDFX) += tdfx/
--obj-$(CONFIG_DRM_R128) += r128/
--obj-$(CONFIG_DRM_RADEON)+= radeon/
--obj-$(CONFIG_DRM_MGA) += mga/
--obj-$(CONFIG_DRM_I810) += i810/
--obj-$(CONFIG_DRM_I915) += i915/
--obj-$(CONFIG_DRM_MGAG200) += mgag200/
--obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus/
--obj-$(CONFIG_DRM_SIS) += sis/
--obj-$(CONFIG_DRM_SAVAGE)+= savage/
--obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
--obj-$(CONFIG_DRM_VIA) +=via/
--obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
--obj-$(CONFIG_DRM_EXYNOS) +=exynos/
--obj-$(CONFIG_DRM_GMA500) += gma500/
--obj-$(CONFIG_DRM_UDL) += udl/
--obj-$(CONFIG_DRM_AST) += ast/
--obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
--obj-$(CONFIG_DRM_TEGRA) += tegra/
--obj-$(CONFIG_DRM_OMAP) += omapdrm/
--obj-$(CONFIG_DRM_TILCDC) += tilcdc/
-+obj-$(CONFIG_COMPAT_DRM) += drm.o
-+obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o
-+obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/
-+obj-$(CONFIG_COMPAT_DRM_TDFX) += tdfx/
-+obj-$(CONFIG_COMPAT_DRM_R128) += r128/
-+obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon/
-+obj-$(CONFIG_COMPAT_DRM_MGA) += mga/
-+obj-$(CONFIG_COMPAT_DRM_I810) += i810/
-+obj-$(CONFIG_COMPAT_DRM_I915) += i915/
-+obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200/
-+obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus/
-+obj-$(CONFIG_COMPAT_DRM_SIS) += sis/
-+obj-$(CONFIG_COMPAT_DRM_SAVAGE)+= savage/
-+obj-$(CONFIG_COMPAT_DRM_VMWGFX)+= vmwgfx/
-+obj-$(CONFIG_COMPAT_DRM_VIA) +=via/
-+obj-$(CONFIG_COMPAT_DRM_NOUVEAU) +=nouveau/
-+obj-$(CONFIG_COMPAT_DRM_EXYNOS) +=exynos/
-+obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500/
-+obj-$(CONFIG_COMPAT_DRM_UDL) += udl/
-+obj-$(CONFIG_COMPAT_DRM_AST) += ast/
-+obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/
-+obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/
-+obj-$(CONFIG_COMPAT_DRM_OMAP) += omapdrm/
-+obj-$(CONFIG_COMPAT_DRM_TILCDC) += tilcdc/
- obj-y += i2c/
+++ /dev/null
---- a/drivers/gpu/drm/ast/Makefile
-+++ b/drivers/gpu/drm/ast/Makefile
-@@ -6,4 +6,4 @@
-
- ast-y := ast_drv.o ast_main.o ast_mode.o ast_fb.o ast_ttm.o ast_post.o
-
--obj-$(CONFIG_DRM_AST) := ast.o
-\ No newline at end of file
-+obj-$(CONFIG_COMPAT_DRM_AST) := ast.o
+++ /dev/null
---- a/drivers/gpu/drm/cirrus/Makefile
-+++ b/drivers/gpu/drm/cirrus/Makefile
-@@ -2,4 +2,4 @@
- cirrus-y := cirrus_main.o cirrus_mode.o \
- cirrus_drv.o cirrus_fbdev.o cirrus_ttm.o
-
--obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o
-+obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus.o
+++ /dev/null
---- a/drivers/gpu/drm/drm_crtc_helper.c
-+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -152,7 +152,7 @@
- goto prune;
- }
-
--#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE
-+#ifdef CONFIG_COMPAT_DRM_LOAD_EDID_FIRMWARE
- count = drm_load_edid_firmware(connector);
- if (count == 0)
- #endif
+++ /dev/null
---- a/drivers/gpu/drm/gma500/Makefile
-+++ b/drivers/gpu/drm/gma500/Makefile
-@@ -49,4 +49,4 @@
- mdfld_tmd_vid.o \
- tc35876x-dsi-lvds.o
-
--obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o
-+obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500_gfx.o
+++ /dev/null
---- a/drivers/gpu/drm/i2c/Makefile
-+++ b/drivers/gpu/drm/i2c/Makefile
-@@ -1,10 +1,10 @@
- ccflags-y := -Iinclude/drm
-
- ch7006-y := ch7006_drv.o ch7006_mode.o
--obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
-+obj-$(CONFIG_COMPAT_DRM_I2C_CH7006) += ch7006.o
-
- sil164-y := sil164_drv.o
--obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
-+obj-$(CONFIG_COMPAT_DRM_I2C_SIL164) += sil164.o
-
- tda998x-y := tda998x_drv.o
--obj-$(CONFIG_DRM_I2C_NXP_TDA998X) += tda998x.o
-+obj-$(CONFIG_COMPAT_DRM_I2C_NXP_TDA998X) += tda998x.o
+++ /dev/null
---- a/drivers/gpu/drm/i810/Makefile
-+++ b/drivers/gpu/drm/i810/Makefile
-@@ -5,4 +5,4 @@
- ccflags-y := -Iinclude/drm
- i810-y := i810_drv.o i810_dma.o
-
--obj-$(CONFIG_DRM_I810) += i810.o
-+obj-$(CONFIG_COMPAT_DRM_I810) += i810.o
+++ /dev/null
---- a/drivers/gpu/drm/i915/Makefile
-+++ b/drivers/gpu/drm/i915/Makefile
-@@ -48,6 +48,6 @@
-
- i915-$(CONFIG_ACPI) += intel_acpi.o
-
--obj-$(CONFIG_DRM_I915) += i915.o
-+obj-$(CONFIG_COMPAT_DRM_I915) += i915.o
-
- CFLAGS_i915_trace_points.o := -I$(src)
+++ /dev/null
---- a/drivers/gpu/drm/mgag200/Makefile
-+++ b/drivers/gpu/drm/mgag200/Makefile
-@@ -2,4 +2,4 @@
- mgag200-y := mgag200_main.o mgag200_mode.o \
- mgag200_drv.o mgag200_fb.o mgag200_i2c.o mgag200_ttm.o
-
--obj-$(CONFIG_DRM_MGAG200) += mgag200.o
-+obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200.o
+++ /dev/null
---- a/drivers/gpu/drm/nouveau/Makefile
-+++ b/drivers/gpu/drm/nouveau/Makefile
-@@ -241,7 +241,7 @@
- ifdef CONFIG_X86
- nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
- endif
--nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
-+nouveau-$(CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
- nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o
-
--obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
-+obj-$(CONFIG_COMPAT_DRM_NOUVEAU)+= nouveau.o
+++ /dev/null
---- a/drivers/gpu/drm/nouveau/nouveau_display.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
-@@ -73,7 +73,7 @@
-
- void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
-
--#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
-+#ifdef CONFIG_COMPAT_DRM_NOUVEAU_BACKLIGHT
- extern int nouveau_backlight_init(struct drm_device *);
- extern void nouveau_backlight_exit(struct drm_device *);
- #else
+++ /dev/null
---- a/drivers/gpu/drm/radeon/Makefile
-+++ b/drivers/gpu/drm/radeon/Makefile
-@@ -82,6 +82,6 @@
- radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o
- radeon-$(CONFIG_ACPI) += radeon_acpi.o
-
--obj-$(CONFIG_DRM_RADEON)+= radeon.o
-+obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon.o
-
- CFLAGS_radeon_trace_points.o := -I$(src)
+++ /dev/null
---- a/drivers/gpu/drm/ttm/Makefile
-+++ b/drivers/gpu/drm/ttm/Makefile
-@@ -11,4 +11,4 @@
- ttm-y += ttm_page_alloc_dma.o
- endif
-
--obj-$(CONFIG_DRM_TTM) += ttm.o
-+obj-$(CONFIG_COMPAT_DRM_TTM) += ttm.o
+++ /dev/null
---- a/drivers/gpu/drm/via/Makefile
-+++ b/drivers/gpu/drm/via/Makefile
-@@ -5,4 +5,4 @@
- ccflags-y := -Iinclude/drm
- via-y := via_irq.o via_drv.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o
-
--obj-$(CONFIG_DRM_VIA) +=via.o
-+obj-$(CONFIG_COMPAT_DRM_VIA) +=via.o
+++ /dev/null
---- a/drivers/gpu/drm/vmwgfx/Makefile
-+++ b/drivers/gpu/drm/vmwgfx/Makefile
-@@ -8,4 +8,4 @@
- vmwgfx_fence.o vmwgfx_dmabuf.o vmwgfx_scrn.o vmwgfx_context.o \
- vmwgfx_surface.o
-
--obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o
-+obj-$(CONFIG_COMPAT_DRM_VMWGFX) := vmwgfx.o
+++ /dev/null
-Remove drivers that we do not want to build from gpu/drm/Makefile
-
+++ /dev/null
---- a/drivers/gpu/drm/Makefile
-+++ b/drivers/gpu/drm/Makefile
-@@ -31,25 +31,14 @@
- obj-$(CONFIG_COMPAT_DRM) += drm.o
- obj-$(CONFIG_COMPAT_DRM_USB) += drm_usb.o
- obj-$(CONFIG_COMPAT_DRM_TTM) += ttm/
--obj-$(CONFIG_COMPAT_DRM_TDFX) += tdfx/
--obj-$(CONFIG_COMPAT_DRM_R128) += r128/
- obj-$(CONFIG_COMPAT_DRM_RADEON)+= radeon/
--obj-$(CONFIG_COMPAT_DRM_MGA) += mga/
- obj-$(CONFIG_COMPAT_DRM_I810) += i810/
- obj-$(CONFIG_COMPAT_DRM_I915) += i915/
- obj-$(CONFIG_COMPAT_DRM_MGAG200) += mgag200/
- obj-$(CONFIG_COMPAT_DRM_CIRRUS_QEMU) += cirrus/
--obj-$(CONFIG_COMPAT_DRM_SIS) += sis/
--obj-$(CONFIG_COMPAT_DRM_SAVAGE)+= savage/
- obj-$(CONFIG_COMPAT_DRM_VMWGFX)+= vmwgfx/
- obj-$(CONFIG_COMPAT_DRM_VIA) +=via/
- obj-$(CONFIG_COMPAT_DRM_NOUVEAU) +=nouveau/
--obj-$(CONFIG_COMPAT_DRM_EXYNOS) +=exynos/
- obj-$(CONFIG_COMPAT_DRM_GMA500) += gma500/
--obj-$(CONFIG_COMPAT_DRM_UDL) += udl/
- obj-$(CONFIG_COMPAT_DRM_AST) += ast/
--obj-$(CONFIG_COMPAT_DRM_SHMOBILE) +=shmobile/
--obj-$(CONFIG_COMPAT_DRM_TEGRA) += tegra/
--obj-$(CONFIG_COMPAT_DRM_OMAP) += omapdrm/
--obj-$(CONFIG_COMPAT_DRM_TILCDC) += tilcdc/
- obj-y += i2c/
+++ /dev/null
---- a/net/rfkill/Makefile
-+++ b/net/rfkill/Makefile
-@@ -2,8 +2,8 @@
- # Makefile for the RF switch subsystem.
- #
-
--rfkill-y += core.o
--rfkill-$(CONFIG_RFKILL_INPUT) += input.o
--obj-$(CONFIG_RFKILL) += rfkill.o
-+rfkill_backport-y += core.o
-+rfkill_backport-$(CONFIG_RFKILL_BACKPORT_INPUT) += input.o
-+obj-$(CONFIG_RFKILL_BACKPORT) += rfkill_backport.o
- obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o
- obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o
+++ /dev/null
-
-Your current kernels configuration (.config and linux/autoconf.h)
-are always respected when compiling external modules. Because
-of this if you are using an old kernel which preferred the
-PID rate control algorithm we cannot force it to use minstrel
-instead. Minstrel is now the default rate control algorithm
-and we want you to use it. To let you use it we redefine here
-the CONFIG_MAC80211_RC_DEFAULT to CONFIG_COMPAT_MAC80211_RC_DEFAULT
-and define CONFIG_COMPAT_MAC80211_RC_DEFAULT on config.mk.
-Through the compat autoconf we then get it also defined there
-at compilation time.
-
+++ /dev/null
---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -24,7 +24,7 @@
- static LIST_HEAD(rate_ctrl_algs);
- static DEFINE_MUTEX(rate_ctrl_mutex);
-
--static char *ieee80211_default_rc_algo = CONFIG_MAC80211_RC_DEFAULT;
-+static char *ieee80211_default_rc_algo = CONFIG_COMPAT_MAC80211_RC_DEFAULT;
- module_param(ieee80211_default_rc_algo, charp, 0644);
- MODULE_PARM_DESC(ieee80211_default_rc_algo,
- "Default rate control algorithm for mac80211 to use");
-@@ -120,8 +120,8 @@
- ops = ieee80211_try_rate_control_ops_get(ieee80211_default_rc_algo);
-
- /* try built-in one if specific alg requested but not found */
-- if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
-- ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
-+ if (!ops && strlen(CONFIG_COMPAT_MAC80211_RC_DEFAULT))
-+ ops = ieee80211_try_rate_control_ops_get(CONFIG_COMPAT_MAC80211_RC_DEFAULT);
- kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
-
- return ops;
+++ /dev/null
-This file renames CONFIG_ options that may be defined in older
-kernels but that we know we can *safely* rename to other config
-option names to ensure we disable building these options at
-through this framework. An example here is ath9k's rate control
-aglorithm is always selected by default via CONFIG_ATH9K_RATE_CONTROL.
-By renaming this to CONFIG_COMPAT_ATH9K_RATE_CONTROL we have
-the flexibility to disable it for a replacement driver.
-
-In kernel 2.6.26 and older CONFIG_IWL4965 was build as an extra
-module, but now it is directly included in the iwlagn.
-
-CONFIG_IWL4965 has to be set to y, to build correctly.
-
-zd1211rw does not build with kernel < 2.6.28, but it is often activated
-in the kernel config of older kernels. We rename the option to
-deactivate it on older kernels.
-CONFIG_BT_L2CAP and CONFIG_BT_SCO are boolean now, but often set to m
-in the kernel config.
-
-CONFIG_BT_HIDP does not build with older kernel versions.
-
+++ /dev/null
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -21,7 +21,7 @@
- obj-$(CONFIG_HOSTAP) += hostap/
- obj-$(CONFIG_B43) += b43/
- obj-$(CONFIG_B43LEGACY) += b43legacy/
--obj-$(CONFIG_ZD1211RW) += zd1211rw/
-+obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw/
- obj-$(CONFIG_RTL8180) += rtl818x/
- obj-$(CONFIG_RTL8187) += rtl818x/
- obj-$(CONFIG_RTLWIFI) += rtlwifi/
-@@ -49,11 +49,11 @@
-
- obj-$(CONFIG_ATH_CARDS) += ath/
-
--obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
-+obj-$(CONFIG_COMPAT_MAC80211_HWSIM) += mac80211_hwsim.o
-
- obj-$(CONFIG_WL_TI) += ti/
-
--obj-$(CONFIG_MWIFIEX) += mwifiex/
-+obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex/
-
- obj-$(CONFIG_BRCMFMAC) += brcm80211/
- obj-$(CONFIG_BRCMSMAC) += brcm80211/
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/Makefile
-+++ b/drivers/net/wireless/ath/ath9k/Makefile
-@@ -8,7 +8,7 @@
- antenna.o
-
- ath9k-$(CONFIG_ATH9K_BTCOEX_SUPPORT) += mci.o
--ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
-+ath9k-$(CONFIG_COMPAT_ATH9K_RATE_CONTROL) += rc.o
- ath9k-$(CONFIG_ATH9K_PCI) += pci.o
- ath9k-$(CONFIG_ATH9K_AHB) += ahb.o
- ath9k-$(CONFIG_ATH9K_DEBUGFS) += debug.o
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -809,7 +809,7 @@
- sc->ant_rx = hw->wiphy->available_antennas_rx;
- sc->ant_tx = hw->wiphy->available_antennas_tx;
-
--#ifdef CONFIG_ATH9K_RATE_CONTROL
-+#ifdef CONFIG_COMPAT_ATH9K_RATE_CONTROL
- hw->rate_control_algorithm = "ath9k_rate_control";
- #endif
-
+++ /dev/null
---- a/drivers/net/wireless/ath/ath9k/rc.h
-+++ b/drivers/net/wireless/ath/ath9k/rc.h
-@@ -231,7 +231,7 @@
- }
- #endif
-
--#ifdef CONFIG_ATH9K_RATE_CONTROL
-+#ifdef CONFIG_COMPAT_ATH9K_RATE_CONTROL
- int ath_rate_control_register(void);
- void ath_rate_control_unregister(void);
- #else
+++ /dev/null
---- a/drivers/net/wireless/iwlegacy/Makefile
-+++ b/drivers/net/wireless/iwlegacy/Makefile
-@@ -5,7 +5,7 @@
- iwlegacy-objs += $(iwlegacy-m)
-
- # 4965
--obj-$(CONFIG_IWL4965) += iwl4965.o
-+obj-$(CONFIG_COMPAT_IWL4965) += iwl4965.o
- iwl4965-objs := 4965.o 4965-mac.o 4965-rs.o 4965-calib.o
- iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
-
+++ /dev/null
---- a/drivers/net/wireless/iwlegacy/common.h
-+++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1348,7 +1348,7 @@
-
- } _3945;
- #endif
--#if defined(CONFIG_IWL4965) || defined(CONFIG_IWL4965_MODULE)
-+#if defined(CONFIG_COMPAT_IWL4965) || defined(CONFIG_COMPAT_IWL4965_MODULE)
- struct {
- struct il_rx_phy_res last_phy_res;
- bool last_phy_res_valid;
+++ /dev/null
---- a/drivers/net/wireless/libertas/Makefile
-+++ b/drivers/net/wireless/libertas/Makefile
-@@ -17,5 +17,5 @@
- obj-$(CONFIG_LIBERTAS) += libertas.o
- obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o
- obj-$(CONFIG_LIBERTAS_CS) += libertas_cs.o
--obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o
-+obj-$(CONFIG_COMPAT_LIBERTAS_SDIO) += libertas_sdio.o
- obj-$(CONFIG_LIBERTAS_SPI) += libertas_spi.o
+++ /dev/null
---- a/drivers/net/wireless/mwifiex/Makefile
-+++ b/drivers/net/wireless/mwifiex/Makefile
-@@ -41,7 +41,7 @@
- mwifiex-y += cfg80211.o
- mwifiex-y += ethtool.o
- mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o
--obj-$(CONFIG_MWIFIEX) += mwifiex.o
-+obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex.o
-
- mwifiex_sdio-y += sdio.o
- obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o
+++ /dev/null
---- a/drivers/net/wireless/ti/wl1251/Makefile
-+++ b/drivers/net/wireless/ti/wl1251/Makefile
-@@ -4,7 +4,7 @@
- wl1251_sdio-objs += sdio.o
-
- obj-$(CONFIG_WL1251) += wl1251.o
--obj-$(CONFIG_WL1251_SPI) += wl1251_spi.o
--obj-$(CONFIG_WL1251_SDIO) += wl1251_sdio.o
-+obj-$(CONFIG_COMPAT_WL1251_SPI)+= wl1251_spi.o
-+obj-$(CONFIG_COMPAT_WL1251_SDIO)+= wl1251_sdio.o
-
- ccflags-y += -D__CHECK_ENDIAN__
+++ /dev/null
---- a/drivers/net/wireless/zd1211rw/Makefile
-+++ b/drivers/net/wireless/zd1211rw/Makefile
-@@ -1,4 +1,4 @@
--obj-$(CONFIG_ZD1211RW) += zd1211rw.o
-+obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw.o
-
- zd1211rw-objs := zd_chip.o zd_mac.o \
- zd_rf_al2230.o zd_rf_rf2959.o \
+++ /dev/null
---- a/include/net/bluetooth/rfcomm.h
-+++ b/include/net/bluetooth/rfcomm.h
-@@ -351,7 +351,7 @@
-
- int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg);
-
--#ifdef CONFIG_BT_RFCOMM_TTY
-+#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY
- int rfcomm_init_ttys(void);
- void rfcomm_cleanup_ttys(void);
- #else
+++ /dev/null
---- a/net/bluetooth/Makefile
-+++ b/net/bluetooth/Makefile
-@@ -6,7 +6,7 @@
- obj-$(CONFIG_BT_RFCOMM) += rfcomm/
- obj-$(CONFIG_BT_BNEP) += bnep/
- obj-$(CONFIG_BT_CMTP) += cmtp/
--obj-$(CONFIG_BT_HIDP) += hidp/
-+obj-$(CONFIG_COMPAT_BT_HIDP) += hidp/
-
- bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \
- hci_sock.o hci_sysfs.o l2cap_core.o l2cap_sock.o smp.o sco.o lib.o \
+++ /dev/null
---- a/net/bluetooth/hidp/Makefile
-+++ b/net/bluetooth/hidp/Makefile
-@@ -2,6 +2,6 @@
- # Makefile for the Linux Bluetooth HIDP layer
- #
-
--obj-$(CONFIG_BT_HIDP) += hidp.o
-+obj-$(CONFIG_COMPAT_BT_HIDP) += hidp.o
-
- hidp-objs := core.o sock.o
+++ /dev/null
---- a/net/bluetooth/rfcomm/Makefile
-+++ b/net/bluetooth/rfcomm/Makefile
-@@ -5,4 +5,4 @@
- obj-$(CONFIG_BT_RFCOMM) += rfcomm.o
-
- rfcomm-y := core.o sock.o
--rfcomm-$(CONFIG_BT_RFCOMM_TTY) += tty.o
-+rfcomm-$(CONFIG_COMPAT_BT_RFCOMM_TTY) += tty.o
+++ /dev/null
---- a/net/bluetooth/rfcomm/sock.c
-+++ b/net/bluetooth/rfcomm/sock.c
-@@ -860,7 +860,7 @@
- err = bt_sock_ioctl(sock, cmd, arg);
-
- if (err == -ENOIOCTLCMD) {
--#ifdef CONFIG_BT_RFCOMM_TTY
-+#ifdef CONFIG_COMPAT_BT_RFCOMM_TTY
- lock_sock(sk);
- err = rfcomm_dev_ioctl(sk, cmd, (void __user *) arg);
- release_sock(sk);
+++ /dev/null
-Rename config names for usbnet to deactivate them also if activated in
-the main kernel configuration. This is needed because
-usb_autopm_put_interface_async and usb_autopm_get_interface_async are
-not backported to kernel 2.6.28 and earlier.
-Remove this patch if these symbols are backported.
-
+++ /dev/null
---- a/drivers/net/usb/Makefile
-+++ b/drivers/net/usb/Makefile
-@@ -10,7 +10,7 @@
- obj-$(CONFIG_USB_NET_AX8817X) += asix.o
- asix-y := asix_devices.o asix_common.o ax88172a.o
- obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o
--obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o
-+obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
- obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
- obj-$(CONFIG_USB_NET_DM9601) += dm9601.o
- obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o
-@@ -18,11 +18,11 @@
- obj-$(CONFIG_USB_NET_GL620A) += gl620a.o
- obj-$(CONFIG_USB_NET_NET1080) += net1080.o
- obj-$(CONFIG_USB_NET_PLUSB) += plusb.o
--obj-$(CONFIG_USB_NET_RNDIS_HOST) += rndis_host.o
-+obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
- obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o
- obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o
- obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
--obj-$(CONFIG_USB_USBNET) += usbnet.o
-+obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
- obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
- obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o
- obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o
+++ /dev/null
---- a/drivers/net/usb/cdc_ether.c
-+++ b/drivers/net/usb/cdc_ether.c
-@@ -33,7 +33,7 @@
- #include <linux/usb/usbnet.h>
-
-
--#if defined(CONFIG_USB_NET_RNDIS_HOST) || defined(CONFIG_USB_NET_RNDIS_HOST_MODULE)
-+#if defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST) || defined(CONFIG_USB_NET_COMPAT_RNDIS_HOST_MODULE)
-
- static int is_rndis(struct usb_interface_descriptor *desc)
- {
+++ /dev/null
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -30,7 +30,7 @@
- obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
- obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
-
--obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
-+obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o
-
- obj-$(CONFIG_USB_ZD1201) += zd1201.o
- obj-$(CONFIG_LIBERTAS) += libertas/
+++ /dev/null
-
-This patch removes all drivers we do not support
-or do not want to support. This lets us build
-only the wireless stuff.
-
+++ /dev/null
---- a/drivers/misc/eeprom/Makefile
-+++ b/drivers/misc/eeprom/Makefile
-@@ -1,7 +1,1 @@
--obj-$(CONFIG_EEPROM_AT24) += at24.o
--obj-$(CONFIG_EEPROM_AT25) += at25.o
--obj-$(CONFIG_EEPROM_LEGACY) += eeprom.o
--obj-$(CONFIG_EEPROM_MAX6875) += max6875.o
- obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
--obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o
--obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o
+++ /dev/null
---- a/drivers/net/usb/Makefile
-+++ b/drivers/net/usb/Makefile
-@@ -2,35 +2,7 @@
- # Makefile for USB Network drivers
- #
-
--obj-$(CONFIG_USB_CATC) += catc.o
--obj-$(CONFIG_USB_KAWETH) += kaweth.o
--obj-$(CONFIG_USB_PEGASUS) += pegasus.o
--obj-$(CONFIG_USB_RTL8150) += rtl8150.o
--obj-$(CONFIG_USB_HSO) += hso.o
--obj-$(CONFIG_USB_NET_AX8817X) += asix.o
--asix-y := asix_devices.o asix_common.o ax88172a.o
--obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o
- obj-$(CONFIG_USB_NET_COMPAT_CDCETHER) += cdc_ether.o
--obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o
--obj-$(CONFIG_USB_NET_DM9601) += dm9601.o
--obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o
--obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o
--obj-$(CONFIG_USB_NET_GL620A) += gl620a.o
--obj-$(CONFIG_USB_NET_NET1080) += net1080.o
--obj-$(CONFIG_USB_NET_PLUSB) += plusb.o
- obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o
--obj-$(CONFIG_USB_NET_CDC_SUBSET) += cdc_subset.o
--obj-$(CONFIG_USB_NET_ZAURUS) += zaurus.o
--obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o
- obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
--obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
--obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o
--obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o
--obj-$(CONFIG_USB_IPHETH) += ipheth.o
--obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o
--obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o
--obj-$(CONFIG_USB_NET_CDC_NCM) += cdc_ncm.o
--obj-$(CONFIG_USB_VL600) += lg-vl600.o
--obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o
--obj-$(CONFIG_USB_NET_CDC_MBIM) += cdc_mbim.o
-
+++ /dev/null
---- a/drivers/net/wireless/Makefile
-+++ b/drivers/net/wireless/Makefile
-@@ -7,18 +7,8 @@
-
- obj-$(CONFIG_HERMES) += orinoco/
-
--obj-$(CONFIG_AIRO) += airo.o
--obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o
--
--obj-$(CONFIG_ATMEL) += atmel.o
--obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o
--obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o
--
- obj-$(CONFIG_AT76C50X_USB) += at76c50x-usb.o
-
--obj-$(CONFIG_PRISM54) += prism54/
--
--obj-$(CONFIG_HOSTAP) += hostap/
- obj-$(CONFIG_B43) += b43/
- obj-$(CONFIG_B43LEGACY) += b43legacy/
- obj-$(CONFIG_COMPAT_ZD1211RW) += zd1211rw/
-@@ -26,13 +16,8 @@
- obj-$(CONFIG_RTL8187) += rtl818x/
- obj-$(CONFIG_RTLWIFI) += rtlwifi/
-
--# 16-bit wireless PCMCIA client drivers
--obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
--obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o
--
- obj-$(CONFIG_USB_NET_COMPAT_RNDIS_WLAN) += rndis_wlan.o
-
--obj-$(CONFIG_USB_ZD1201) += zd1201.o
- obj-$(CONFIG_LIBERTAS) += libertas/
-
- obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/
+++ /dev/null
---- a/net/wireless/Makefile
-+++ b/net/wireless/Makefile
-@@ -4,11 +4,6 @@
- obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
- obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
-
--obj-$(CONFIG_WEXT_CORE) += wext-core.o
--obj-$(CONFIG_WEXT_PROC) += wext-proc.o
--obj-$(CONFIG_WEXT_SPY) += wext-spy.o
--obj-$(CONFIG_WEXT_PRIV) += wext-priv.o
--
- cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
- cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o
- cfg80211-$(CONFIG_COMPAT_CFG80211_DRIVER_API_TRACER) += trace.o
projects / openwrt / staging / blogic.git / commitdiff