diff options
-rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 12 | ||||
-rw-r--r-- | debian.master/config/armel/config.common.armel | 13 | ||||
-rw-r--r-- | debian.master/config/armhf/config.flavour.highbank | 13 | ||||
-rw-r--r-- | debian.master/config/armhf/config.flavour.omap | 13 | ||||
-rw-r--r-- | debian.master/config/config.common.ubuntu | 13 | ||||
-rw-r--r-- | debian.master/config/i386/config.common.i386 | 12 | ||||
-rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 12 | ||||
-rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 12 |
8 files changed, 13 insertions, 87 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index fbb0662fb80..627b9f9888f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -41,8 +41,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_LZO=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DEBUG_INFO=y CONFIG_DEBUG_KERNEL=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -50,11 +48,8 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_DM_RAID45=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m @@ -64,28 +59,21 @@ CONFIG_FB_3DFX=m CONFIG_FB_ATY128=m CONFIG_FB_BACKLIGHT=y CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_BROADSHEET=m CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_DDC=m # CONFIG_FB_MACMODES is not set -CONFIG_FB_METRONOME=m CONFIG_FB_RADEON=m -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m CONFIG_FB_SVGALIB=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_TILEBLITTING=y -CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=m CONFIG_FIRMWARE_EDID=y # CONFIG_FONTS is not set -CONFIG_FT1000=m CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_GENERIC_TIME_VSYSCALL=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index f9b39868f94..c6040c26b38 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -41,23 +41,17 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_LZO=m -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DEBUG_INFO=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_USER=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -CONFIG_DM9000=m # CONFIG_DM_RAID45 is not set CONFIG_DVB_FE_CUSTOMISE=y # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DW_DMAC=m -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m @@ -66,28 +60,21 @@ CONFIG_FAT_FS=y CONFIG_FB_ARMCLCD=m # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_BROADSHEET=m CONFIG_FB_CFB_COPYAREA=m CONFIG_FB_CFB_FILLRECT=m CONFIG_FB_CFB_IMAGEBLIT=m # CONFIG_FB_DDC is not set # CONFIG_FB_MACMODES is not set -CONFIG_FB_METRONOME=m -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m # CONFIG_FB_SVGALIB is not set CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m CONFIG_FB_SYS_IMAGEBLIT=m # CONFIG_FB_TILEBLITTING is not set -CONFIG_FB_UDL=m # CONFIG_FIRMWARE_EDID is not set CONFIG_FONTS=y CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_FPE_NWFPE=y -CONFIG_FT1000=m CONFIG_FTRACE=y # CONFIG_FUNCTION_TRACER is not set CONFIG_GPIO_SYSFS=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 59f679cf375..19dafe917fa 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -29,32 +29,19 @@ CONFIG_CACHE_L2X0=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CPU_IDLE is not set # CONFIG_CRASH_DUMP is not set -# CONFIG_DE600 is not set -# CONFIG_DE620 is not set # CONFIG_DEBUG_KERNEL is not set # CONFIG_DEBUG_USER is not set # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_DM9000 is not set # CONFIG_DW_DMAC is not set -# CONFIG_ECHO is not set CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENABLE_WARN_DEPRECATED=y -# CONFIG_ENC28J60 is not set -# CONFIG_ETHOC is not set # CONFIG_EVM is not set # CONFIG_EXPERT is not set CONFIG_EXT2_FS=y # CONFIG_FANOTIFY is not set # CONFIG_FB_ARMCLCD is not set -# CONFIG_FB_BROADSHEET is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_SM7XX is not set -# CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_UDL is not set # CONFIG_FONTS is not set # CONFIG_FPE_NWFPE is not set -# CONFIG_FT1000 is not set # CONFIG_FTRACE is not set # CONFIG_GPIO_SYSFS is not set # CONFIG_HAMRADIO is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 221db72553b..02f97ec42ed 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -29,32 +29,19 @@ CONFIG_CLEANCACHE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_CPU_IDLE=y CONFIG_CRASH_DUMP=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_USER=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -CONFIG_DM9000=m CONFIG_DW_DMAC=m -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m CONFIG_FANOTIFY=y CONFIG_FB_ARMCLCD=m -CONFIG_FB_BROADSHEET=m -CONFIG_FB_METRONOME=m -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m CONFIG_FONTS=y CONFIG_FPE_NWFPE=y -CONFIG_FT1000=m CONFIG_FTRACE=y CONFIG_GPIO_SYSFS=y CONFIG_HAMRADIO=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d2dac101eac..20359433329 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1211,6 +1211,8 @@ CONFIG_DCDBAS=m CONFIG_DE2104X=m CONFIG_DE2104X_DSL=0 CONFIG_DE4X5=m +CONFIG_DE600=m +CONFIG_DE620=m CONFIG_DEBUGGER=y # CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_BLK_CGROUP is not set @@ -1310,6 +1312,7 @@ CONFIG_DLCI=m CONFIG_DLCI_MAX=8 CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set +CONFIG_DM9000=m # CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set CONFIG_DM9102=m CONFIG_DMADEVICES=y @@ -1557,6 +1560,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK_INTEL_MID=y CONFIG_EASYCAP=m # CONFIG_EASYCAP_DEBUG is not set +CONFIG_ECHO=m CONFIG_ECONET=m CONFIG_ECONET_AUNUDP=y CONFIG_ECONET_NATIVE=y @@ -1622,6 +1626,7 @@ CONFIG_ELMC=m CONFIG_ELMC_II=m CONFIG_ELPLUS=m # CONFIG_EMBEDDED is not set +CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y @@ -1635,6 +1640,7 @@ CONFIG_ESI_DONGLE=m CONFIG_ET131X=m CONFIG_ETH16I=m CONFIG_ETHERNET=y +CONFIG_ETHOC=m CONFIG_EUROTECH_WDT=m CONFIG_EVENTFD=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y @@ -1682,6 +1688,7 @@ CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_ATY_CT=y CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_ATY_GX=y +CONFIG_FB_BROADSHEET=m CONFIG_FB_CARILLO_RANCH=m CONFIG_FB_CARMINE=m CONFIG_FB_CARMINE_DRAM_EVAL=y @@ -1720,6 +1727,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_I2C=y # CONFIG_FB_MB862XX_LIME is not set CONFIG_FB_MB862XX_PCI_GDC=y +CONFIG_FB_METRONOME=m CONFIG_FB_MODE_HELPERS=y CONFIG_FB_N411=m CONFIG_FB_NEOMAGIC=m @@ -1744,6 +1752,7 @@ CONFIG_FB_RIVA=m CONFIG_FB_RIVA_BACKLIGHT=y # CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_RIVA_I2C=y +CONFIG_FB_S1D13XXX=m CONFIG_FB_S3=m CONFIG_FB_S3_DDC=y CONFIG_FB_SAVAGE=m @@ -1753,9 +1762,12 @@ CONFIG_FB_SIS=m CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y CONFIG_FB_SM501=m +CONFIG_FB_SM7XX=m +CONFIG_FB_SMSCUFX=m CONFIG_FB_TMIO=m CONFIG_FB_TMIO_ACCELL=y CONFIG_FB_TRIDENT=m +CONFIG_FB_UDL=m CONFIG_FB_UVESA=m CONFIG_FB_VALKYRIE=y CONFIG_FB_VESA=m @@ -1816,6 +1828,7 @@ CONFIG_FSL_LBC=y CONFIG_FSNOTIFY=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y +CONFIG_FT1000=m CONFIG_FT1000_PCMCIA=m CONFIG_FT1000_USB=m # CONFIG_FTGMAC100 is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e8b832f008d..6bde70ce96e 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -40,8 +40,6 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_IDLE=y CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_LZO=y -CONFIG_DE600=m -CONFIG_DE620=m CONFIG_DEBUG_INFO=y CONFIG_DEBUG_KERNEL=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -49,11 +47,8 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_DM_RAID45=m # CONFIG_DVB_FE_CUSTOMISE is not set # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m @@ -63,28 +58,21 @@ CONFIG_FB_3DFX=m CONFIG_FB_ATY128=m CONFIG_FB_BACKLIGHT=y CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_BROADSHEET=m CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_DDC=m # CONFIG_FB_MACMODES is not set -CONFIG_FB_METRONOME=m CONFIG_FB_RADEON=m -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m CONFIG_FB_SVGALIB=m CONFIG_FB_SYS_COPYAREA=m CONFIG_FB_SYS_FILLRECT=m CONFIG_FB_SYS_FOPS=m CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_TILEBLITTING=y -CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=m CONFIG_FIRMWARE_EDID=y # CONFIG_FONTS is not set -CONFIG_FT1000=m CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y # CONFIG_GENERIC_TIME_VSYSCALL is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 9cb590bdf5e..d7062c22592 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -34,8 +34,6 @@ CONFIG_CLEANCACHE=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_IDLE=y CONFIG_CRYPTO_LZO=m -CONFIG_DE600=m -CONFIG_DE620=m # CONFIG_DEBUG_INFO is not set CONFIG_DEBUG_KERNEL=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -43,11 +41,8 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_DM_RAID45 is not set # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m @@ -57,24 +52,17 @@ CONFIG_FB_3DFX=y CONFIG_FB_ATY128=y CONFIG_FB_BACKLIGHT=y # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_BROADSHEET=m CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_DDC=y CONFIG_FB_MACMODES=y -CONFIG_FB_METRONOME=m CONFIG_FB_RADEON=y -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m CONFIG_FB_SVGALIB=m CONFIG_FB_TILEBLITTING=y -CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=y CONFIG_FIRMWARE_EDID=y # CONFIG_FONTS is not set -CONFIG_FT1000=m CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_GENERIC_TIME_VSYSCALL=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 1c49b5a5137..0cdb739eef4 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -39,8 +39,6 @@ CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_IDLE=y CONFIG_CRASH_DUMP=y CONFIG_CRYPTO_LZO=m -CONFIG_DE600=m -CONFIG_DE620=m # CONFIG_DEBUG_INFO is not set CONFIG_DEBUG_KERNEL=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -48,11 +46,8 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y # CONFIG_DM_RAID45 is not set # CONFIG_DVB_FE_CUSTOMISE is not set CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y -CONFIG_ECHO=m # CONFIG_ENABLE_MUST_CHECK is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -CONFIG_ENC28J60=m -CONFIG_ETHOC=m CONFIG_EVM=y CONFIG_EXPERT=y CONFIG_EXT2_FS=m @@ -62,29 +57,22 @@ CONFIG_FB_3DFX=y CONFIG_FB_ATY128=y CONFIG_FB_BACKLIGHT=y # CONFIG_FB_BOOT_VESA_SUPPORT is not set -CONFIG_FB_BROADSHEET=m CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_DDC=y CONFIG_FB_MACMODES=y -CONFIG_FB_METRONOME=m CONFIG_FB_RADEON=y -CONFIG_FB_S1D13XXX=m -CONFIG_FB_SM7XX=m -CONFIG_FB_SMSCUFX=m CONFIG_FB_SVGALIB=m CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y CONFIG_FB_TILEBLITTING=y -CONFIG_FB_UDL=m CONFIG_FB_VOODOO1=y CONFIG_FIRMWARE_EDID=y # CONFIG_FONTS is not set CONFIG_FORCE_MAX_ZONEORDER=9 -CONFIG_FT1000=m CONFIG_FTRACE=y CONFIG_FUNCTION_TRACER=y CONFIG_GENERIC_TIME_VSYSCALL=y |