UBUNTU: [Config] highbank -- commonise N-P modules missmatches

    CONFIG_NETCONSOLE=m
    CONFIG_NET_IPGRE_DEMUX=m
    CONFIG_NET_IPIP=m
    CONFIG_NET_PKTGEN=m
    CONFIG_NFC=m
    CONFIG_NFSD=m
    CONFIG_NOP_USB_XCEIV=y
    CONFIG_OPROFILE=m
    CONFIG_P54_COMMON=m
    CONFIG_PARPORT_AX88796=m
    CONFIG_PARPORT_PC=m
    CONFIG_POWER_SUPPLY=y
    CONFIG_PPDEV=m
    CONFIG_PPP=y
    CONFIG_PPP_MPPE=m
    CONFIG_PPS=m
    CONFIG_PRINTER=m
    CONFIG_PRISM2_USB=m

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

9 files changed, 21 insertions, 135 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index db20ae35b7c..e725742f9b7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -175,16 +175,8 @@ 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_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="utf8"
@@ -192,13 +184,9 @@ CONFIG_NODES_SHIFT=6
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=256
 CONFIG_NVRAM=m
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
-CONFIG_P54_COMMON=m
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_PC=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
@@ -211,19 +199,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PRISM2_USB=m
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -288,7 +270,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 60da4bdc8f7..fb273ce0ce5 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -182,28 +182,17 @@ CONFIG_MTD_OF_PARTS=y
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NVRAM=m
 CONFIG_OC_ETM=y
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
-CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
 CONFIG_PATA_ARASAN_CF=m
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
@@ -216,19 +205,13 @@ CONFIG_PMIC_DA903X=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINT_QUOTA_WARNING=y
-CONFIG_PRISM2_USB=m
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -294,7 +277,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5f731cf22f3..77e6a2dbe4a 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -56,13 +56,14 @@ CONFIG_MMC_SDHCI=y
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_NR_CPUS=4
 CONFIG_NVRAM=m
 CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARPORT_PC is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PM_DEBUG is not set
+CONFIG_POWER_SUPPLY=y
 CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_REGULATOR_DEBUG is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 08fc1347ca9..c49352d00a4 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -128,25 +128,13 @@ CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_OF_PARTS=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
 CONFIG_NET_CALXEDA_XGMAC=y
 # CONFIG_NET_DMA is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_NFC is not set
-# CONFIG_NFSD is not set
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_OC_ETM is not set
-CONFIG_OPROFILE=y
 # CONFIG_OSF_PARTITION is not set
-# CONFIG_P54_COMMON is not set
 # CONFIG_PARPORT_1284 is not set
-# CONFIG_PARPORT_AX88796 is not set
 # CONFIG_PATA_ARASAN_CF is not set
 # CONFIG_PERF_COUNTERS is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -155,19 +143,12 @@ CONFIG_PL330_DMA=y
 # CONFIG_PMIC_DA903X is not set
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_PM_RUNTIME is not set
-CONFIG_POWER_SUPPLY=m
-# CONFIG_PPDEV is not set
-CONFIG_PPP=m
 # CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_MPPE is not set
 # CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPS is not set
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PRINTER is not set
 # CONFIG_PRINTK_TIME is not set
-# CONFIG_PRISM2_USB is not set
 # CONFIG_PSTORE is not set
 # CONFIG_QFMT_V1 is not set
 # CONFIG_QFMT_V2 is not set
@@ -224,7 +205,6 @@ CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
-CONFIG_SLHC=m
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
 # CONFIG_SMSC911X is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 9b04f36ebba..2ac53be18e7 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -128,25 +128,13 @@ 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_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NOP_USB_XCEIV=y
 CONFIG_OC_ETM=y
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
-CONFIG_P54_COMMON=m
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PERF_COUNTERS=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -155,19 +143,12 @@ CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
-CONFIG_PRISM2_USB=m
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -224,7 +205,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 CONFIG_SMC911X=m
 CONFIG_SMC91X=m
 CONFIG_SMSC911X=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b3d3e44ecf6..d9a47ecfcec 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3433,6 +3433,7 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEON=y
 CONFIG_NET=y
 CONFIG_NET5501=y
+CONFIG_NETCONSOLE=m
 CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETDEVICES=y
 CONFIG_NETFILTER=y
@@ -3511,6 +3512,7 @@ CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETLABEL=y
+CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NETPRIO_CGROUP=m
 CONFIG_NETROM=m
@@ -3565,10 +3567,14 @@ CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_FC=y
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPIP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_NS=y
 CONFIG_NET_PACKET_ENGINE=y
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NET_SB1000=m
 CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_ATM=m
@@ -3644,10 +3650,12 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NEW_LEDS=y
+CONFIG_NFC=m
 # CONFIG_NFC_LLCP is not set
 CONFIG_NFC_NCI=m
 CONFIG_NFC_PN533=m
 CONFIG_NFC_WILINK=m
+CONFIG_NFSD=m
 # CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -3831,6 +3839,7 @@ CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_OMFS_FS=m
 CONFIG_OPENVSWITCH=m
+CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_OPTIMIZE_INLINING=y
@@ -3840,6 +3849,7 @@ CONFIG_ORINOCO_USB=m
 CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_OVERLAYFS_FS=m
+CONFIG_P54_COMMON=m
 CONFIG_P54_LEDS=y
 CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
@@ -3891,8 +3901,10 @@ CONFIG_PARIDE_PF=m
 CONFIG_PARIDE_PG=m
 CONFIG_PARIDE_PT=m
 CONFIG_PARPORT=m
+CONFIG_PARPORT_AX88796=m
 # CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_NOT_PC=y
+CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_PC_FIFO=y
 CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_PC_SUPERIO is not set
@@ -4135,13 +4147,17 @@ CONFIG_PPC_STD_MMU_64=y
 CONFIG_PPC_SUBPAGE_PROT=y
 CONFIG_PPC_UDBG_16550=y
 # CONFIG_PPC_WSP is not set
+CONFIG_PPDEV=m
+CONFIG_PPP=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
 CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
@@ -4153,8 +4169,10 @@ CONFIG_PREEMPT_COUNT=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_PRINTER=m
 CONFIG_PRINTK=y
 CONFIG_PRINT_STACK_DEPTH=64
+CONFIG_PRISM2_USB=m
 CONFIG_PRISM54=m
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_PROC_DEVICETREE=y
@@ -4833,6 +4851,7 @@ CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 # CONFIG_SLAB is not set
 CONFIG_SLABINFO=y
+CONFIG_SLHC=y
 CONFIG_SLICOSS=m
 CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index cf4f3f03e0c..f5e5212f5fd 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -175,30 +175,18 @@ 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_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=8
 CONFIG_NVRAM=m
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_PC=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
@@ -211,19 +199,13 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
 CONFIG_POWER_SUPPLY=y
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PRISM2_USB=m
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -288,7 +270,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 8c23e3c26cc..5ac7f11900a 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -163,28 +163,16 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
-CONFIG_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVRAM=y
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
-CONFIG_P54_COMMON=m
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_PC=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
@@ -201,19 +189,13 @@ CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_SMLPAR is not set
 # CONFIG_PPC_SPLPAR is not set
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PRISM2_USB=m
 CONFIG_PSERIES_ENERGY=m
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
@@ -278,7 +260,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index ad788082e88..946c2600c07 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -181,16 +181,8 @@ 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_NETCONSOLE=m
-CONFIG_NETPOLL=y
 CONFIG_NET_CALXEDA_XGMAC=m
 CONFIG_NET_DMA=y
-CONFIG_NET_IPGRE_DEMUX=m
-CONFIG_NET_IPIP=m
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_NFC=m
-CONFIG_NFSD=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_DEFAULT="utf8"
@@ -198,13 +190,9 @@ CONFIG_NODES_SHIFT=8
 CONFIG_NONSTATIC_KERNEL=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=1024
-CONFIG_OPROFILE=m
 CONFIG_OSF_PARTITION=y
-CONFIG_P54_COMMON=m
 CONFIG_PAGE_OFFSET=0xc000000000000000
 CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_PC=m
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
@@ -233,19 +221,13 @@ CONFIG_PPC_P7_NAP=y
 CONFIG_PPC_SMLPAR=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_PPC_XICS=y
-CONFIG_PPDEV=m
-CONFIG_PPP=y
 CONFIG_PPP_FILTER=y
-CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
-CONFIG_PPS=m
 # CONFIG_PREEMPT is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_PRINTER=m
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_PRISM2_USB=m
 CONFIG_PSERIES_ENERGY=y
 CONFIG_PSTORE=y
 CONFIG_QFMT_V1=m
@@ -312,7 +294,6 @@ CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_RAW=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
-CONFIG_SLHC=y
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m