From 6f3c20550ebde2612668d0a5d375ff860323faab Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Jun 2012 10:30:11 +0100 Subject: [PATCH 27/34] UBUNTU: [Config] highbank -- commonise G-I modules missmatches CONFIG_HTC_PASIC3=m CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m CONFIG_INPUT_TWL6040_VIBRA=m CONFIG_INPUT_YEALINK=m CONFIG_IPMI_DEVICE_INTERFACE=m CONFIG_IPMI_HANDLER=m CONFIG_IPMI_POWEROFF=m CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPV6_MIP6=m CONFIG_IPV6_TUNNEL=m CONFIG_IP_DCCP=m CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_TCP=m CONFIG_IWM=m Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 16 ---------------- debian.master/config/armel/config.common.armel | 19 ------------------- debian.master/config/armhf/config.flavour.highbank | 19 ------------------- debian.master/config/armhf/config.flavour.omap | 19 ------------------- debian.master/config/config.common.ubuntu | 19 +++++++++++++++++++ debian.master/config/i386/config.common.i386 | 16 ---------------- debian.master/config/powerpc/config.common.powerpc | 19 ------------------- debian.master/config/ppc64/config.common.ppc64 | 19 ------------------- 8 files changed, 19 insertions(+), 127 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e7ef3fa..e207d84 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -107,7 +107,6 @@ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIDRAW=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m CONFIG_HUGETLB_PAGE=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=m @@ -121,28 +120,17 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_YEALINK=m CONFIG_INTEL_TXT=y CONFIG_INTR_REMAP=y CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m CONFIG_IP_MULTICAST=y # CONFIG_IP_PNP is not set CONFIG_IRDA_CACHE_LAST_LSAP=y @@ -150,10 +138,7 @@ CONFIG_IRDA_DEBUG=y CONFIG_IRDA_FAST_RR=y CONFIG_IRDA_ULTRA=y # CONFIG_IRQ_PER_CPU is not set -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y @@ -328,7 +313,6 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 40964aa..35b4bdf 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -97,7 +97,6 @@ CONFIG_HIDRAW=y # CONFIG_HIGHMEM is not set CONFIG_HTC_EGPIO=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m # CONFIG_HUGETLB_PAGE is not set CONFIG_HVC_DCC=y CONFIG_HZ=128 @@ -111,38 +110,21 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_YEALINK=m -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m 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_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m # CONFIG_IWMC3200TOP_DEBUGFS is not set CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y @@ -316,7 +298,6 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index eefaaaa..95236bf 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -52,7 +52,6 @@ CONFIG_FB_CFB_IMAGEBLIT=m CONFIG_HIGHMEM=y # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_I2CPLD is not set -# CONFIG_HTC_PASIC3 is not set # CONFIG_HVC_DCC is not set CONFIG_HZ=100 CONFIG_I2C_DESIGNWARE_PLATFORM=y @@ -62,38 +61,21 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set # CONFIG_INLINE_WRITE_UNLOCK is not set # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set -# CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_SPARSEKMAP is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_TWL4030_PWRBUTTON is not set -# CONFIG_INPUT_TWL4030_VIBRA is not set -# CONFIG_INPUT_TWL6040_VIBRA is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_IPMI_DEVICE_INTERFACE is not set -CONFIG_IPMI_HANDLER=y -# CONFIG_IPMI_POWEROFF is not set -CONFIG_IPMI_SI=y -# CONFIG_IPMI_WATCHDOG is not set -# CONFIG_IPV6_MIP6 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_IPV6_TUNNEL is not set # CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_DCCP 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_ISCSI_BOOT_SYSFS is not set -# CONFIG_ISCSI_TCP is not set # CONFIG_ISDN is not set -# CONFIG_IWM is not set # CONFIG_JFS_SECURITY is not set # CONFIG_JFS_STATISTICS is not set # CONFIG_KARMA_PARTITION is not set @@ -235,7 +217,6 @@ CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_DH is not set # CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_NETLINK is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index bd911df..d5f0007 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -52,7 +52,6 @@ CONFIG_HIDRAW=y # CONFIG_HIGHMEM is not set CONFIG_HTC_EGPIO=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m CONFIG_HVC_DCC=y CONFIG_HZ=128 CONFIG_I2C_DESIGNWARE_PLATFORM=m @@ -62,38 +61,21 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_YEALINK=m -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m 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_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y CONFIG_KARMA_PARTITION=y @@ -235,7 +217,6 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6cb587d..4c985e2 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2071,6 +2071,7 @@ CONFIG_HP_ACCEL=m CONFIG_HP_ILO=m # CONFIG_HP_WATCHDOG is not set CONFIG_HP_WMI=m +CONFIG_HTC_PASIC3=m CONFIG_HT_IRQ=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y @@ -2350,11 +2351,17 @@ CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_PCF8574=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_TWL4030_PWRBUTTON=m +CONFIG_INPUT_TWL4030_VIBRA=m +CONFIG_INPUT_TWL6040_VIBRA=m CONFIG_INPUT_UINPUT=y CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_WM831X_ON=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m +CONFIG_INPUT_YEALINK=m CONFIG_INSTRUCTION_DECODER=y CONFIG_INTEGRITY=y CONFIG_INTEL_IOATDMA=m @@ -2406,9 +2413,15 @@ CONFIG_IPDDP=m CONFIG_IPDDP_DECAP=y CONFIG_IPDDP_ENCAP=y # CONFIG_IPIC is not set +CONFIG_IPMI_DEVICE_INTERFACE=m +CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set +CONFIG_IPMI_POWEROFF=m +CONFIG_IPMI_SI=m +CONFIG_IPMI_WATCHDOG=m CONFIG_IPPP_FILTER=y CONFIG_IPV6=y +CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_OPTIMISTIC_DAD is not set @@ -2416,6 +2429,7 @@ CONFIG_IPV6_PIMSM_V2=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_SIT=m CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_TUNNEL=m CONFIG_IPW2100=m # CONFIG_IPW2100_DEBUG is not set CONFIG_IPW2100_MONITOR=y @@ -2428,6 +2442,7 @@ CONFIG_IPW2200_RADIOTAP=y CONFIG_IPWIRELESS=m CONFIG_IPX=m # CONFIG_IPX_INTERN is not set +CONFIG_IP_DCCP=m # CONFIG_IP_DCCP_CCID2_DEBUG is not set CONFIG_IP_DCCP_CCID3=y # CONFIG_IP_DCCP_CCID3_DEBUG is not set @@ -2533,9 +2548,11 @@ CONFIG_IR_STREAMZAP=m CONFIG_IR_WINBOND_CIR=m CONFIG_ISAPNP=y CONFIG_ISA_DMA_API=y +CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_IBFT=m CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_TARGET=m +CONFIG_ISCSI_TCP=m CONFIG_ISDN_AUDIO=y CONFIG_ISDN_CAPI=m CONFIG_ISDN_CAPI_CAPI20=m @@ -2592,6 +2609,7 @@ CONFIG_IWLWIFI_LEGACY=m # CONFIG_IWLWIFI_LEGACY_DEBUG is not set # CONFIG_IWLWIFI_LEGACY_DEBUGFS is not set # CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set +CONFIG_IWM=m CONFIG_IWMC3200TOP=m # CONFIG_IWMC3200TOP_DEBUG is not set # CONFIG_IWM_DEBUG is not set @@ -4320,6 +4338,7 @@ CONFIG_SCSI_IPR=m # CONFIG_SCSI_IPR_TRACE is not set CONFIG_SCSI_IPS=m CONFIG_SCSI_ISCI=m +CONFIG_SCSI_ISCSI_ATTRS=m # CONFIG_SCSI_IZIP_EPP16 is not set # CONFIG_SCSI_IZIP_SLOW_CTR is not set CONFIG_SCSI_LOWLEVEL=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1c7d24f..016dd69 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -107,7 +107,6 @@ CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIDRAW=y CONFIG_HIGHMEM=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m CONFIG_HUGETLB_PAGE=y CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=m @@ -120,27 +119,16 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_YEALINK=m # CONFIG_INTEL_TXT is not set # CONFIG_INTR_REMAP is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m CONFIG_IP_MULTICAST=y # CONFIG_IP_PNP is not set CONFIG_IRDA_CACHE_LAST_LSAP=y @@ -149,10 +137,7 @@ CONFIG_IRDA_FAST_RR=y CONFIG_IRDA_ULTRA=y # CONFIG_IRQ_PER_CPU is not set CONFIG_ISA=y -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y @@ -327,7 +312,6 @@ CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=y CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 3b651d1..5fcf9a8 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -94,7 +94,6 @@ CONFIG_HAMRADIO=y CONFIG_HIDRAW=y CONFIG_HIGHMEM=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m # CONFIG_HVC_CONSOLE is not set CONFIG_HZ=250 CONFIG_I2C_ALGOBIT=y @@ -108,29 +107,15 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_YEALINK=m CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m CONFIG_IP_MULTICAST=y # CONFIG_IP_PNP is not set CONFIG_IRDA_CACHE_LAST_LSAP=y @@ -140,10 +125,7 @@ CONFIG_IRDA_ULTRA=y # CONFIG_IRQ_ALL_CPUS is not set CONFIG_IRQ_PER_CPU=y # CONFIG_ISA is not set -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y @@ -319,7 +301,6 @@ CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m CONFIG_SCSI_FC_ATTRS=m # CONFIG_SCSI_IBMVSCSIS is not set -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 21ae746..6bda333 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -104,7 +104,6 @@ CONFIG_HAMRADIO=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_HIDRAW=y CONFIG_HTC_I2CPLD=y -CONFIG_HTC_PASIC3=m CONFIG_HUGETLB_PAGE=y CONFIG_HVC_CONSOLE=y CONFIG_HZ=250 @@ -119,29 +118,15 @@ CONFIG_INLINE_SPIN_UNLOCK=y CONFIG_INLINE_SPIN_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_SPARSEKMAP=m CONFIG_INPUT_TABLET=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_INPUT_TWL4030_PWRBUTTON=m -CONFIG_INPUT_TWL4030_VIBRA=m -CONFIG_INPUT_TWL6040_VIBRA=m -CONFIG_INPUT_YEALINK=m CONFIG_IOMMU_HELPER=y -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_HANDLER=m -CONFIG_IPMI_POWEROFF=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPV6_MIP6=m CONFIG_IPV6_MROUTE=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_TUNNEL=m CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_DCCP=m CONFIG_IP_MULTICAST=y # CONFIG_IP_PNP is not set CONFIG_IRDA_CACHE_LAST_LSAP=y @@ -150,10 +135,7 @@ CONFIG_IRDA_FAST_RR=y CONFIG_IRDA_ULTRA=y CONFIG_IRQ_ALL_CPUS=y CONFIG_IRQ_PER_CPU=y -CONFIG_ISCSI_BOOT_SYSFS=m -CONFIG_ISCSI_TCP=m CONFIG_ISDN=y -CONFIG_IWM=m CONFIG_IWMC3200TOP_DEBUGFS=y CONFIG_JFS_SECURITY=y CONFIG_JFS_STATISTICS=y @@ -351,7 +333,6 @@ CONFIG_SCSI_DEBUG=m CONFIG_SCSI_DH=m CONFIG_SCSI_FC_ATTRS=m CONFIG_SCSI_IBMVSCSIS=m -CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_LOGGING=y CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_NETLINK=y -- 1.7.9.5