[PATCH 19/19] UBUNTU: [Config] Align highbank config with amd64-generic and add new configs
Ike Panhc
ike.pan at canonical.com
Mon Oct 1 10:04:02 UTC 2012
From: Rob Herring <rob.herring at calxeda.com>
BugLink: http://launchpad.net/bugs/1059432
Using CONFIG_TREE_RCU instead of CONFIG_TREE_PREEMPT_RCU
Using CONFIG_PREEMPT_NONE instead of CONFIG_PREEMPT
Enabling
CONFIG_BSD_PROCESS_ACCT
CONFIG_TASKSTATS
CONFIG_RELAY
CONFIG_KPROBES
CONFIG_PM_RUNTIME
CONFIG_IP_MULTICAST
CONFIG_IP_ADVANCED_ROUTER
CONFIG_TCP_CONG_ADVANCED
CONFIG_IPV6_SIT_6RD
CONFIG_IPV6_MULTIPLE_TABLES
CONFIG_IPV6_MROUTE
CONFIG_SCSI_MULTI_LUN
CONFIG_SCSI_CONSTANTS
CONFIG_SATA_HIGHBANK
CONFIG_REISERFS_FS_POSIX_ACL
CONFIG_REISERFS_FS_SECURITY
CONFIG_JFS_SECURITY
CONFIG_JFS_STATISTICS
CONFIG_FANOTIFY
CONFIG_PRINTK_TIME
CONFIG_FTRACE
Disabling
CONFIG_USB_MUSB_HDRC
Modulize
CONFIG_SATA_AHCI_PLATFORM
For other flavours, CONFIG_NET_CALXEDA_XGMAC only for ARM, so removed
Signed-off-by: Rob Herring <rob.herring at calxeda.com>
Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
debian.master/config/amd64/config.common.amd64 | 33 +--------------
debian.master/config/armel/config.common.armel | 32 +--------------
debian.master/config/armhf/config.common.armhf | 2 +-
debian.master/config/armhf/config.flavour.highbank | 34 ++--------------
debian.master/config/armhf/config.flavour.omap | 34 ++--------------
debian.master/config/config.common.ubuntu | 42 +++++++++++++++-----
debian.master/config/i386/config.common.i386 | 33 +--------------
debian.master/config/powerpc/config.common.powerpc | 33 +--------------
debian.master/config/ppc64/config.common.ppc64 | 33 +--------------
9 files changed, 49 insertions(+), 227 deletions(-)
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5a9b3d7..8bd4377 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -24,10 +24,8 @@ CONFIG_AUDIT_ARCH=y
CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_BCH=m
-CONFIG_BINARY_PRINTF=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_CFG80211_REG_DEBUG=y
CONFIG_CLEANCACHE=y
@@ -49,7 +47,6 @@ CONFIG_EDAC_MM_EDAC=m
CONFIG_EVM=y
CONFIG_EXT2_FS=m
CONFIG_EZX_PCAP=y
-CONFIG_FANOTIFY=y
CONFIG_FAT_FS=y
CONFIG_FB_3DFX=m
CONFIG_FB_ATY128=m
@@ -70,7 +67,6 @@ CONFIG_FB_TILEBLITTING=y
CONFIG_FB_VOODOO1=m
CONFIG_FIRMWARE_EDID=y
# CONFIG_FONTS is not set
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_GPIO_SYSFS=y
CONFIG_HAMRADIO=y
@@ -86,19 +82,9 @@ CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_DESIGNWARE_CORE=m
# CONFIG_IDE is not set
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
CONFIG_INTEL_TXT=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
@@ -106,12 +92,9 @@ CONFIG_IRDA_FAST_RR=y
CONFIG_IRDA_ULTRA=y
CONFIG_ISDN=y
CONFIG_IWMC3200TOP_DEBUGFS=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KEXEC=y
CONFIG_KGDB=y
-CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_LATENCYTOP=y
CONFIG_LDM_PARTITION=y
@@ -164,7 +147,6 @@ CONFIG_MUSB_PIO_ONLY=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_DMA=y
CONFIG_NL80211_TESTMODE=y
CONFIG_NLS_CODEPAGE_437=y
@@ -184,34 +166,25 @@ CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
CONFIG_PM_DEBUG=y
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
# CONFIG_PM_WAKELOCKS is not set
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_RCU_FANOUT=64
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
CONFIG_RTC_DRV_CMOS=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_SMT=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=y
@@ -250,9 +223,7 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
CONFIG_SYS_HYPERVISOR=y
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -267,10 +238,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_GADGET=m
# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_VERSION_SIGNATURE=""
CONFIG_VFAT_FS=y
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 1bfa481..a67c810 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -21,10 +21,8 @@ CONFIG_ATM_BR2684_IPFILTER=y
CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_BCH=y
-CONFIG_BINARY_PRINTF=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_CACHE_L2X0 is not set
CONFIG_CFG80211_REG_DEBUG=y
@@ -48,7 +46,6 @@ CONFIG_DVB_FE_CUSTOMISE=y
CONFIG_EVM=y
CONFIG_EXT2_FS=m
# CONFIG_EZX_PCAP is not set
-CONFIG_FANOTIFY=y
CONFIG_FAT_FS=y
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
@@ -67,7 +64,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
CONFIG_FONTS=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_FPE_NWFPE=y
-CONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_TWL4030=y
@@ -84,18 +80,8 @@ CONFIG_HZ=128
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
@@ -103,12 +89,9 @@ CONFIG_IRDA_FAST_RR=y
CONFIG_IRDA_ULTRA=y
CONFIG_ISDN=y
# CONFIG_IWMC3200TOP_DEBUGFS is not set
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KEXEC=y
CONFIG_KGDB=y
-CONFIG_KPROBES=y
# CONFIG_KSM is not set
CONFIG_LATENCYTOP=y
CONFIG_LDM_PARTITION=y
@@ -182,33 +165,24 @@ CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
# CONFIG_RT2800USB_UNKNOWN is not set
CONFIG_RT2X00_LIB_DEBUGFS=y
CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_PL031=m
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_OSD_INITIATOR is not set
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=m
@@ -247,9 +221,7 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
# CONFIG_TOUCHSCREEN_EETI is not set
@@ -266,10 +238,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
# CONFIG_USB_ARCH_HAS_XHCI is not set
CONFIG_USB_GADGET=y
CONFIG_USB_G_MULTI=m
+CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_TUSB6010 is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_VERSION_SIGNATURE=""
CONFIG_VFAT_FS=y
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index b708376..2f40ef4 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -33,7 +33,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FORCE_MAX_ZONEORDER=11
-# CONFIG_FUNCTION_TRACER is not set
CONFIG_GPIO_TWL4030=y
# CONFIG_HARDLOCKUP_DETECTOR is not set
CONFIG_HAVE_AOUT=y
@@ -51,6 +50,7 @@ CONFIG_MAX_RAW_DEVS=256
CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
# CONFIG_MTD_SM_COMMON is not set
+# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NL80211_TESTMODE is not set
CONFIG_NOP_USB_XCEIV=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index e885560..8fea12b 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -13,9 +13,7 @@ CONFIG_ARCH_HIGHBANK=y
# CONFIG_ATARI_PARTITION is not set
# CONFIG_AUXDISPLAY is not set
CONFIG_BCH=m
-# CONFIG_BINARY_PRINTF is not set
# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_BTRFS_FS_POSIX_ACL is not set
CONFIG_CACHE_L2X0=y
# CONFIG_CFG80211_REG_DEBUG is not set
@@ -30,13 +28,12 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_EVM is not set
CONFIG_EXT2_FS=y
-# CONFIG_FANOTIFY is not set
CONFIG_FB_CFB_COPYAREA=m
CONFIG_FB_CFB_FILLRECT=m
CONFIG_FB_CFB_IMAGEBLIT=m
# CONFIG_FONTS is not set
# CONFIG_FPE_NWFPE is not set
-# CONFIG_FTRACE is not set
+CONFIG_FUNCTION_TRACER=y
# CONFIG_GPIO_SYSFS is not set
# CONFIG_HAMRADIO is not set
# CONFIG_HIDRAW is not set
@@ -46,29 +43,16 @@ CONFIG_FB_CFB_IMAGEBLIT=m
CONFIG_HZ=100
CONFIG_I2C_DESIGNWARE_CORE=y
CONFIG_I2C_DESIGNWARE_PLATFORM=y
-# CONFIG_INLINE_READ_UNLOCK is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_IPV6_PRIVACY is not set
# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_SIT_6RD is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_MULTICAST is not set
CONFIG_IP_PNP=y
# CONFIG_IRDA_CACHE_LAST_LSAP is not set
# CONFIG_IRDA_DEBUG is not set
# CONFIG_IRDA_FAST_RR is not set
# CONFIG_IRDA_ULTRA is not set
# CONFIG_ISDN is not set
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_STATISTICS is not set
# CONFIG_KARMA_PARTITION is not set
# CONFIG_KEXEC is not set
-# CONFIG_KPROBES is not set
# CONFIG_LDM_PARTITION is not set
CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_LOGIG940_FF is not set
@@ -111,7 +95,6 @@ CONFIG_MTD_NAND_BCH=m
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_IDS=m
CONFIG_MTD_OF_PARTS=m
-CONFIG_MUSB_PIO_ONLY=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NET_CALXEDA_XGMAC=y
# CONFIG_NET_DMA is not set
@@ -124,25 +107,16 @@ CONFIG_PL330_DMA=y
# CONFIG_PMIC_ADP5520 is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_PM_DEVFREQ is not set
-# CONFIG_PM_RUNTIME is not set
# CONFIG_PPP_FILTER is not set
# CONFIG_PPP_MULTILINK is not set
-CONFIG_PREEMPT=y
-CONFIG_PREEMPT_RCU=y
+CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PRINTK_TIME is not set
# CONFIG_PSTORE is not set
# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-# CONFIG_REISERFS_FS_POSIX_ACL is not set
-# CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_RELAY is not set
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_TWL4030=m
-CONFIG_SATA_AHCI_PLATFORM=y
# CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
# CONFIG_SECURITY_SELINUX_DISABLE is not set
@@ -170,9 +144,7 @@ CONFIG_SPI_PL022=y
CONFIG_SWP_EMULATE=y
# CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_SYSV68_PARTITION is not set
-# CONFIG_TASKSTATS is not set
# CONFIG_TCG_TPM is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
# CONFIG_TCP_MD5SIG is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TWL4030_POWER is not set
@@ -184,7 +156,7 @@ CONFIG_SWP_EMULATE=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
CONFIG_USB_GADGET=m
# CONFIG_USB_G_MULTI is not set
-CONFIG_VERSION_SIGNATURE="Ubuntu 3.2.0-1800.1-highbank 3.2.9"
+# CONFIG_USB_MUSB_HDRC is not set
# CONFIG_VIRT_DRIVERS is not set
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_WAN is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 3d14465..8acd151 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -13,9 +13,7 @@ CONFIG_ASYNC_TX_DMA=y
CONFIG_ATARI_PARTITION=y
CONFIG_AUXDISPLAY=y
CONFIG_BCH=y
-CONFIG_BINARY_PRINTF=y
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_CACHE_L2X0 is not set
CONFIG_CFG80211_REG_DEBUG=y
@@ -30,13 +28,12 @@ CONFIG_DEBUG_USER=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
CONFIG_EVM=y
CONFIG_EXT2_FS=m
-CONFIG_FANOTIFY=y
CONFIG_FB_CFB_COPYAREA=y
CONFIG_FB_CFB_FILLRECT=y
CONFIG_FB_CFB_IMAGEBLIT=y
CONFIG_FONTS=y
CONFIG_FPE_NWFPE=y
-CONFIG_FTRACE=y
+# CONFIG_FUNCTION_TRACER is not set
CONFIG_GPIO_SYSFS=y
CONFIG_HAMRADIO=y
CONFIG_HIDRAW=y
@@ -46,29 +43,16 @@ CONFIG_HVC_DCC=y
CONFIG_HZ=128
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_I2C_DESIGNWARE_PLATFORM=m
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
CONFIG_IRDA_FAST_RR=y
CONFIG_IRDA_ULTRA=y
CONFIG_ISDN=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KEXEC=y
-CONFIG_KPROBES=y
CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
CONFIG_LOGIG940_FF=y
@@ -111,7 +95,6 @@ CONFIG_MTD_NAND_BCH=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_IDS=y
CONFIG_MTD_OF_PARTS=y
-# CONFIG_MUSB_PIO_ONLY is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_DMA=y
@@ -124,25 +107,16 @@ CONFIG_PL330_DMA=m
CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
CONFIG_RTC_DRV_PL031=m
CONFIG_RTC_DRV_TWL4030=y
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SCHED_AUTOGROUP=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SECURITY_SELINUX_BOOTPARAM=y
CONFIG_SECURITY_SELINUX_DISABLE=y
@@ -170,9 +144,7 @@ CONFIG_SUN_PARTITION=y
# CONFIG_SWP_EMULATE is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TWL4030_POWER=y
@@ -184,7 +156,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_GADGET=y
CONFIG_USB_G_MULTI=m
-CONFIG_VERSION_SIGNATURE=""
+CONFIG_USB_MUSB_HDRC=m
CONFIG_VIRT_DRIVERS=y
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_WAN=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 11fd92f..9abfe5c 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -571,6 +571,7 @@ CONFIG_BE2NET=m
# CONFIG_BEFS_DEBUG is not set
CONFIG_BEFS_FS=m
CONFIG_BFS_FS=m
+CONFIG_BINARY_PRINTF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=m
@@ -708,6 +709,7 @@ CONFIG_BRIDGE_NETFILTER=y
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BROADCOM_PHY=y
CONFIG_BROKEN_ON_SMP=y
+CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_BT=m
CONFIG_BTREE=y
@@ -1272,7 +1274,6 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_DEBUG_PREEMPT is not set
CONFIG_DEBUG_RODATA=y
# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
@@ -1706,6 +1707,7 @@ CONFIG_EXTRA_TARGETS=""
CONFIG_EXYNOS_VIDEO=y
CONFIG_F71808E_WDT=m
CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FANOTIFY=y
CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_FARSYNC=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
@@ -1875,6 +1877,7 @@ CONFIG_FT1000_USB=m
# CONFIG_FTGMAC100 is not set
CONFIG_FTL=m
# CONFIG_FTMAC100 is not set
+CONFIG_FTRACE=y
CONFIG_FTRACE_MCOUNT_RECORD=y
# CONFIG_FTRACE_STARTUP_TEST is not set
CONFIG_FTRACE_SYSCALLS=y
@@ -1931,7 +1934,6 @@ CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_IRQ_SHOW=y
CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_LOCKBREAK=y
CONFIG_GENERIC_NVRAM=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_PENDING_IRQ=y
@@ -2457,7 +2459,9 @@ CONFIG_INIT_PASS_ALL_PARAMS=y
# CONFIG_INLINE_READ_LOCK_IRQ is not set
# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
# CONFIG_INLINE_READ_TRYLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
# CONFIG_INLINE_SPIN_LOCK is not set
# CONFIG_INLINE_SPIN_LOCK_BH is not set
@@ -2466,13 +2470,16 @@ CONFIG_INIT_PASS_ALL_PARAMS=y
# CONFIG_INLINE_SPIN_TRYLOCK is not set
# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
# CONFIG_INLINE_WRITE_LOCK is not set
# CONFIG_INLINE_WRITE_LOCK_BH is not set
# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
# CONFIG_INLINE_WRITE_TRYLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
CONFIG_INOTIFY_USER=y
CONFIG_INPUT=y
@@ -2602,12 +2609,15 @@ CONFIG_IPMI_WATCHDOG=m
CONFIG_IPPP_FILTER=y
CONFIG_IPV6=y
CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_MROUTE=y
CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_OPTIMISTIC_DAD is not set
CONFIG_IPV6_PIMSM_V2=y
CONFIG_IPV6_ROUTE_INFO=y
CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
CONFIG_IPV6_SUBTREES=y
CONFIG_IPV6_TUNNEL=m
CONFIG_IPW2100=m
@@ -2622,6 +2632,7 @@ CONFIG_IPW2200_RADIOTAP=y
CONFIG_IPWIRELESS=m
CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
+CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_DCCP=m
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=y
@@ -2631,6 +2642,7 @@ CONFIG_IP_DCCP_TFRC_LIB=y
CONFIG_IP_FIB_TRIE_STATS=y
CONFIG_IP_MROUTE=y
# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_MULTICAST=y
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARPTABLES=m
@@ -2828,6 +2840,8 @@ CONFIG_JFFS2_ZLIB=y
# CONFIG_JFS_DEBUG is not set
CONFIG_JFS_FS=m
CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+CONFIG_JFS_STATISTICS=y
CONFIG_JME=m
CONFIG_JOLIET=y
CONFIG_JOYSTICK_A3D=m
@@ -2876,7 +2890,6 @@ CONFIG_KEYBOARD_ADP5589=m
CONFIG_KEYBOARD_ATKBD=y
CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_GPIO_POLLED=m
-CONFIG_KEYBOARD_HIGHBANK=y
CONFIG_KEYBOARD_LKKBD=m
CONFIG_KEYBOARD_LM8323=m
CONFIG_KEYBOARD_LM8333=m
@@ -2906,6 +2919,7 @@ CONFIG_KGDB_LOW_LEVEL_TRAP=y
CONFIG_KGDB_SERIAL_CONSOLE=y
# CONFIG_KGDB_TESTS is not set
CONFIG_KINGSUN_DONGLE=m
+CONFIG_KPROBES=y
# CONFIG_KPROBES_SANITY_TEST is not set
CONFIG_KPROBE_EVENT=y
CONFIG_KRETPROBES=y
@@ -3897,6 +3911,7 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
# CONFIG_OF_SELFTEST is not set
CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_OLD_MCOUNT=y
CONFIG_OMAP2_DSS=y
# CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
@@ -4162,6 +4177,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
# CONFIG_PM_AUTOSLEEP is not set
CONFIG_PM_CLK=y
CONFIG_PM_OPP=y
+CONFIG_PM_RUNTIME=y
CONFIG_PM_SLEEP=y
CONFIG_PM_SLEEP_SMP=y
CONFIG_PM_STD_PARTITION=""
@@ -4268,12 +4284,13 @@ CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPTP=m
# CONFIG_PQ2ADS is not set
-CONFIG_PREEMPT_COUNT=y
-# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT is not set
CONFIG_PREEMPT_NOTIFIERS=y
+# CONFIG_PREEMPT_RCU is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_PRINTER=m
CONFIG_PRINTK=y
+CONFIG_PRINTK_TIME=y
# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_PRINT_STACK_DEPTH=64
CONFIG_PRISM2_USB=m
@@ -4367,10 +4384,8 @@ CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_TSI721=y
CONFIG_RAW_DRIVER=m
-# CONFIG_RCU_BOOST is not set
# CONFIG_RCU_CPU_STALL_INFO is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-CONFIG_RCU_CPU_STALL_VERBOSE=y
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_RCU_FANOUT_LEAF=16
CONFIG_RCU_FAST_NO_HZ=y
@@ -4446,8 +4461,11 @@ CONFIG_REGULATOR_WM8400=m
CONFIG_REGULATOR_WM8994=m
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_FS=m
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
CONFIG_REISERFS_FS_XATTR=y
# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_RELAY=y
CONFIG_RELOCATABLE=y
CONFIG_RESOURCE_COUNTERS=y
CONFIG_RFD_FTL=m
@@ -4592,6 +4610,8 @@ CONFIG_SAMSUNG_LAPTOP=m
CONFIG_SAMSUNG_Q10=m
CONFIG_SATA_ACARD_AHCI=m
CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_HIGHBANK=y
CONFIG_SATA_INIC162X=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
@@ -4646,6 +4666,7 @@ CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_BNX2X_FCOE=m
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_CXGB4_ISCSI=m
CONFIG_SCSI_DC390T=m
@@ -4703,6 +4724,7 @@ CONFIG_SCSI_MOD=y
CONFIG_SCSI_MPT2SAS=m
# CONFIG_SCSI_MPT2SAS_LOGGING is not set
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_MVSAS=m
CONFIG_SCSI_MVSAS_DEBUG=y
# CONFIG_SCSI_MVSAS_TASKLET is not set
@@ -5474,6 +5496,7 @@ CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
CONFIG_TABLET_USB_WACOM=m
CONFIG_TARGET_CORE=m
+CONFIG_TASKSTATS=y
CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASK_SIZE=0xc0000000
@@ -5492,6 +5515,7 @@ CONFIG_TCM_FILEIO=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_PSCSI=m
CONFIG_TCM_QLA2XXX=m
+CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
CONFIG_TCP_CONG_CUBIC=y
CONFIG_TCP_CONG_HSTCP=m
@@ -5642,7 +5666,6 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
CONFIG_TRANZPORT=m
-CONFIG_TREE_PREEMPT_RCU=y
CONFIG_TREE_RCU=y
# CONFIG_TREE_RCU_TRACE is not set
CONFIG_TRUSTED_KEYS=y
@@ -5687,7 +5710,6 @@ CONFIG_UIO_SERCOS3=m
CONFIG_ULI526X=m
CONFIG_ULTRA=m
CONFIG_ULTRA32=m
-CONFIG_UNINLINE_SPIN_UNLOCK=y
CONFIG_UNIX=y
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX_DIAG=m
@@ -5857,7 +5879,6 @@ CONFIG_USB_MON=m
CONFIG_USB_MOUSE=m
CONFIG_USB_MR800=m
# CONFIG_USB_MUSB_AM35X is not set
-CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_OMAP2PLUS=m
CONFIG_USB_MV_UDC=m
CONFIG_USB_NET2272=m
@@ -6053,6 +6074,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_V4L_RADIO_ISA_DRIVERS=y
CONFIG_V4L_USB_DRIVERS=y
CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_VERSION_SIGNATURE=""
CONFIG_VETH=m
CONFIG_VFP=y
CONFIG_VFPv3=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 71b6443..e25ebc2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -23,10 +23,8 @@ CONFIG_ATA_PIIX=y
CONFIG_AUXDISPLAY=y
CONFIG_AX25_DAMA_SLAVE=y
CONFIG_BCH=m
-CONFIG_BINARY_PRINTF=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_CFG80211_REG_DEBUG=y
CONFIG_CLEANCACHE=y
@@ -48,7 +46,6 @@ CONFIG_EDAC_MM_EDAC=m
CONFIG_EVM=y
CONFIG_EXT2_FS=m
CONFIG_EZX_PCAP=y
-CONFIG_FANOTIFY=y
CONFIG_FAT_FS=y
CONFIG_FB_3DFX=m
CONFIG_FB_ATY128=m
@@ -69,7 +66,6 @@ CONFIG_FB_TILEBLITTING=y
CONFIG_FB_VOODOO1=m
CONFIG_FIRMWARE_EDID=y
# CONFIG_FONTS is not set
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_GPIO_SYSFS=y
CONFIG_HAMRADIO=y
@@ -85,19 +81,9 @@ CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_DESIGNWARE_CORE=m
# CONFIG_IDE is not set
CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
# CONFIG_INTEL_TXT is not set
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
@@ -106,12 +92,9 @@ CONFIG_IRDA_ULTRA=y
CONFIG_ISA=y
CONFIG_ISDN=y
CONFIG_IWMC3200TOP_DEBUGFS=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KEXEC=y
CONFIG_KGDB=y
-CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_LATENCYTOP=y
CONFIG_LDM_PARTITION=y
@@ -163,7 +146,6 @@ CONFIG_MUSB_PIO_ONLY=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_DMA=y
CONFIG_NL80211_TESTMODE=y
CONFIG_NLS_CODEPAGE_437=y
@@ -183,34 +165,25 @@ CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
CONFIG_PM_DEBUG=y
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_RCU_FANOUT=32
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
CONFIG_RTC_DRV_CMOS=y
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_SMT=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=y
@@ -249,9 +222,7 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
CONFIG_SYS_HYPERVISOR=y
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -266,10 +237,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_GADGET=m
# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_VERSION_SIGNATURE=""
CONFIG_VFAT_FS=y
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 402d671..02cf011 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -19,10 +19,8 @@ CONFIG_AUDIT_ARCH=y
CONFIG_AUXDISPLAY=y
# CONFIG_AX25_DAMA_SLAVE is not set
CONFIG_BCH=m
-CONFIG_BINARY_PRINTF=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_CLEANCACHE=y
# CONFIG_COMPACTION is not set
@@ -42,7 +40,6 @@ CONFIG_EDAC_MM_EDAC=m
CONFIG_EVM=y
CONFIG_EXT2_FS=m
CONFIG_EZX_PCAP=y
-CONFIG_FANOTIFY=y
CONFIG_FAT_FS=m
CONFIG_FB_3DFX=y
CONFIG_FB_ATY128=y
@@ -59,7 +56,6 @@ CONFIG_FB_TILEBLITTING=y
CONFIG_FB_VOODOO1=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FONTS is not set
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TWL4030=m
@@ -75,18 +71,8 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_DESIGNWARE_CORE=m
# CONFIG_IBMEBUS is not set
# CONFIG_IDE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
@@ -96,11 +82,8 @@ CONFIG_IRDA_ULTRA=y
# CONFIG_ISA is not set
CONFIG_ISDN=y
CONFIG_IWMC3200TOP_DEBUGFS=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KEXEC=y
-CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_LDM_PARTITION=y
CONFIG_LEGACY_PTY_COUNT=0
@@ -152,7 +135,6 @@ CONFIG_MTD_OF_PARTS=m
CONFIG_MTD_SM_COMMON=m
CONFIG_MUSB_PIO_ONLY=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_DMA=y
CONFIG_NL80211_TESTMODE=y
CONFIG_NLS_CODEPAGE_437=m
@@ -170,7 +152,6 @@ CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PPC_4K_PAGES=y
# CONFIG_PPC_64K_PAGES is not set
@@ -178,30 +159,22 @@ CONFIG_PPC_4K_PAGES=y
# CONFIG_PPC_SPLPAR is not set
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSERIES_ENERGY=m
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
# CONFIG_RTAS_FLASH is not set
CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_TWL4030=m
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_SVW=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_SMT=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=m
@@ -241,9 +214,7 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -259,11 +230,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_GADGET=m
# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
-CONFIG_VERSION_SIGNATURE=""
CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index d68ba20..88875eb 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -22,10 +22,8 @@ CONFIG_AUDIT_ARCH=y
CONFIG_AUXDISPLAY=y
# CONFIG_AX25_DAMA_SLAVE is not set
CONFIG_BCH=m
-CONFIG_BINARY_PRINTF=y
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BSD_DISKLABEL=y
-CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_CFG80211_REG_DEBUG is not set
CONFIG_CLEANCACHE=y
@@ -47,7 +45,6 @@ CONFIG_EDAC_MM_EDAC=m
CONFIG_EVM=y
CONFIG_EXT2_FS=m
CONFIG_EZX_PCAP=y
-CONFIG_FANOTIFY=y
CONFIG_FAT_FS=m
CONFIG_FB_3DFX=y
CONFIG_FB_ATY128=y
@@ -69,7 +66,6 @@ CONFIG_FB_VOODOO1=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FONTS is not set
CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_GPIO_SYSFS is not set
CONFIG_GPIO_TWL4030=m
@@ -87,18 +83,8 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_DESIGNWARE_CORE=m
CONFIG_IBMEBUS=y
CONFIG_IDE=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-CONFIG_IPV6_MROUTE=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_SIT_6RD=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTICAST=y
# CONFIG_IP_PNP is not set
CONFIG_IRDA_CACHE_LAST_LSAP=y
CONFIG_IRDA_DEBUG=y
@@ -107,13 +93,10 @@ CONFIG_IRDA_ULTRA=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_ISDN=y
CONFIG_IWMC3200TOP_DEBUGFS=y
-CONFIG_JFS_SECURITY=y
-CONFIG_JFS_STATISTICS=y
CONFIG_KARMA_PARTITION=y
CONFIG_KERNEL_START=0xc000000000000000
CONFIG_KEXEC=y
CONFIG_KGDB=y
-CONFIG_KPROBES=y
CONFIG_KSM=y
CONFIG_LATENCYTOP=y
CONFIG_LDM_PARTITION=y
@@ -171,7 +154,6 @@ CONFIG_MUSB_PIO_ONLY=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NET_CALXEDA_XGMAC=m
CONFIG_NET_DMA=y
CONFIG_NL80211_TESTMODE=y
CONFIG_NLS_CODEPAGE_437=m
@@ -192,7 +174,6 @@ CONFIG_PMIC_ADP5520=y
CONFIG_PMIC_DA903X=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_DEVFREQ=y
-CONFIG_PM_RUNTIME=y
CONFIG_PM_WAKELOCKS=y
CONFIG_PPC64=y
# CONFIG_PPC_4K_PAGES is not set
@@ -211,32 +192,24 @@ CONFIG_PPC_SPLPAR=y
CONFIG_PPC_XICS=y
CONFIG_PPP_FILTER=y
CONFIG_PPP_MULTILINK=y
-# CONFIG_PREEMPT is not set
-# CONFIG_PREEMPT_RCU is not set
+# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTK_TIME=y
CONFIG_PSERIES_ENERGY=y
CONFIG_PSTORE=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_RCU_FANOUT=64
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_FIXED_VOLTAGE=m
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_RELAY=y
CONFIG_RT2800USB_UNKNOWN=y
# CONFIG_RT2X00_LIB_DEBUGFS is not set
CONFIG_RTAS_FLASH=y
CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_TWL4030=m
-CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_SVW=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_AUTOGROUP=y
CONFIG_SCHED_SMT=y
-CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_OSD_INITIATOR=m
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=m
@@ -276,9 +249,7 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_SYSV68_PARTITION=y
# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_TASKSTATS=y
CONFIG_TCG_TPM=y
-CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_MD5SIG=y
CONFIG_TEST_KSTRTOX=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -294,11 +265,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_GADGET=m
# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_MUSB_HDRC=m
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
-CONFIG_VERSION_SIGNATURE=""
CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=64
--
1.7.9.5
More information about the kernel-team
mailing list