UBUNTU: [Config] highbank -- enable CONFIG_RFKILL=y and CONFIG_CAN=m

These can be enabled if the following individual drivers are disabled:

    CONFIG_CAN_C_CAN_PLATFORM
    CONFIG_RFKILL_GPIO

Signed-off-by: Andy Whitcroft <apw@canonical.com>

8 files changed, 12 insertions, 16 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index cdc1a1323be..9c81f3bf539 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -29,7 +29,7 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
@@ -211,7 +211,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTC_DRV_CMOS=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index f1fc4bc00a9..1248e5049cb 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -28,7 +28,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
@@ -216,7 +216,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
+CONFIG_RFKILL_GPIO=m
 # CONFIG_RT2800USB_UNKNOWN is not set
 CONFIG_RT2X00_LIB_DEBUGFS=y
 CONFIG_RTC_DRV_CMOS=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 9881495f8fb..1fe77a1928c 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -19,7 +19,7 @@ CONFIG_BCH=m
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
 CONFIG_CACHE_L2X0=y
-# CONFIG_CAN is not set
+# CONFIG_CAN_C_CAN_PLATFORM is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
@@ -149,7 +149,7 @@ CONFIG_PREEMPT_RCU=y
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_RELAY is not set
-# CONFIG_RFKILL is not set
+# CONFIG_RFKILL_GPIO is not set
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SATA_MV is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 6fb7579860f..1cf77568a66 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -19,7 +19,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -149,7 +149,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
+CONFIG_RFKILL_GPIO=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b31e71b0dc5..dfe4c3b5e4b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -757,13 +757,13 @@ CONFIG_CAIF_TTY=m
 CONFIG_CAIF_USB=m
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_CAN=m
 CONFIG_CAN_BCM=m
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_CC770=m
 CONFIG_CAN_CC770_ISA=m
 CONFIG_CAN_CC770_PLATFORM=m
 CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_EMS_PCI=m
@@ -4423,7 +4423,7 @@ CONFIG_REISERFS_FS_XATTR=y
 CONFIG_RELOCATABLE=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_RFD_FTL=m
-CONFIG_RFKILL_GPIO=m
+CONFIG_RFKILL=y
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_REGULATOR=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 67b1b51307d..ad9f7415689 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -28,7 +28,7 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
@@ -210,7 +210,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTC_DRV_CMOS=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 52b237ef9c2..5047cf7c58b 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -24,7 +24,7 @@ CONFIG_BINARY_PRINTF=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -201,7 +201,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RTAS_FLASH is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 250dcea92d1..949a4b87bf1 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -27,7 +27,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
@@ -235,7 +235,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REISERFS_FS_POSIX_ACL=y
 CONFIG_REISERFS_FS_SECURITY=y
 CONFIG_RELAY=y
-CONFIG_RFKILL=y
 CONFIG_RT2800USB_UNKNOWN=y
 # CONFIG_RT2X00_LIB_DEBUGFS is not set
 CONFIG_RTAS_FLASH=y