debian/config: Reorder config.

svn path=/dists/trunk/linux/; revision=20596
This commit is contained in:
Bastian Blank 2013-09-10 20:21:27 +00:00
parent 79b11873dc
commit 12b7a6ff80
7 changed files with 56 additions and 48 deletions

View File

@ -747,11 +747,6 @@ CONFIG_TMD_HERMES=m
CONFIG_PCI_HERMES=m
CONFIG_PCMCIA_HERMES=m
##
## file: drivers/pci/pcie/Kconfig
##
# CONFIG_PCIEPORTBUS is not set
##
## file: drivers/pcmcia/Kconfig
##
@ -1114,3 +1109,8 @@ CONFIG_SND_YMFPCI=m
##
CONFIG_SND_HDA_INTEL=m
##
## file: unknown
##
# CONFIG_PCIEPORTBUS is not set

View File

@ -11,7 +11,6 @@
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP4XX is not set
@ -19,7 +18,6 @@ CONFIG_ARCH_IOP32X=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_OMAP is not set
## end choice
CONFIG_PCI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
@ -309,7 +307,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
CONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_FTL=m
CONFIG_NFTL=m
@ -356,9 +353,6 @@ CONFIG_MTD_RAM=m
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLOCK2MTD is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
##
## file: drivers/mtd/maps/Kconfig
@ -682,3 +676,12 @@ CONFIG_SND_RIPTIDE=m
##
# CONFIG_SND_HDA_INTEL is not set
##
## file: unknown
##
# CONFIG_ARCH_H720X is not set
CONFIG_MTD_CHAR=y
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set

View File

@ -11,7 +11,6 @@
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IOP33X is not set
CONFIG_ARCH_IXP4XX=y
@ -19,7 +18,6 @@ CONFIG_ARCH_IXP4XX=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_OMAP is not set
## end choice
CONFIG_PCI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
@ -302,6 +300,10 @@ CONFIG_INPUT_TOUCHSCREEN=y
##
CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y
##
## file: drivers/leds/trigger/Kconfig
##
CONFIG_LEDS_TRIGGER_TIMER=y
##
@ -330,7 +332,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
# CONFIG_MTD_AFS_PARTS is not set
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_FTL=m
CONFIG_NFTL=m
@ -377,9 +378,6 @@ CONFIG_MTD_M25P80=m
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLOCK2MTD is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set
##
## file: drivers/mtd/maps/Kconfig
@ -810,3 +808,12 @@ CONFIG_SND_PCXHR=m
##
# CONFIG_SND_HDA_INTEL is not set
##
## file: unknown
##
# CONFIG_ARCH_H720X is not set
CONFIG_MTD_CHAR=y
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not set

14
debian/config/config vendored
View File

@ -1,3 +1,9 @@
##
## file: arch/Kconfig
##
CONFIG_KPROBES=y
CONFIG_UPROBES=y
##
## file: block/Kconfig
##
@ -4129,8 +4135,8 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
CONFIG_NFS_V4_2=y
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
@ -5232,9 +5238,11 @@ CONFIG_NET_CLS_IND=y
CONFIG_IP_SCTP=m
CONFIG_NET_SCTPPROBE=m
# CONFIG_SCTP_DBG_OBJCNT is not set
## choice: Default SCTP cookie HMAC encoding
CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
## end choice
CONFIG_SCTP_COOKIE_HMAC_MD5=y
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
@ -5507,7 +5515,6 @@ CONFIG_HID_WIIMOTE_EXT=y
# CONFIG_I2C_INTEL_MID is not set
CONFIG_IPDDP_DECAP=y
CONFIG_IP_NF_QUEUE=m
CONFIG_KPROBES=y
CONFIG_LEDS_ALIX2=m
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
CONFIG_MTD_ONENAND_SIM=m
@ -5519,7 +5526,6 @@ CONFIG_NFC_LLCP=y
# CONFIG_SERIAL_MAX3107 is not set
CONFIG_SND_HDA_POWER_SAVE=y
CONFIG_TIPC_ADVANCED=y
CONFIG_UPROBES=y
CONFIG_USB_EZUSB=y
# CONFIG_USB_LIBUSUAL is not set
CONFIG_USB_SUSPEND=y

View File

@ -411,11 +411,6 @@ CONFIG_PDC_STABLE=y
##
# CONFIG_HOTPLUG_PCI is not set
##
## file: drivers/pci/pcie/Kconfig
##
# CONFIG_PCIEPORTBUS is not set
##
## file: drivers/pcmcia/Kconfig
##
@ -729,3 +724,8 @@ CONFIG_SND_HARMONY=m
##
# CONFIG_SND_HDA_INTEL is not set
##
## file: unknown
##
# CONFIG_PCIEPORTBUS is not set

View File

@ -125,11 +125,6 @@ CONFIG_NVRAM=y
##
CONFIG_CONNECTOR=m
##
## file: drivers/cpufreq/Kconfig
##
# CONFIG_CPU_FREQ is not set
##
## file: drivers/crypto/Kconfig
##
@ -753,23 +748,6 @@ CONFIG_LOG_BUF_SHIFT=16
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_MODULE_SIG is not set
##
## file: kernel/Kconfig.hz
##
## choice: Timer frequency
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
## end choice
##
## file: kernel/power/Kconfig
##
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM_RUNTIME is not set
##
## file: kernel/time/Kconfig
##
@ -951,3 +929,15 @@ CONFIG_DMASOUND_ATARI=m
CONFIG_DMASOUND_PAULA=m
CONFIG_DMASOUND_Q40=m
##
## file: unknown
##
# CONFIG_CPU_FREQ is not set
# CONFIG_HIBERNATION is not set
CONFIG_HZ_100=y
# CONFIG_HZ_1000 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
# CONFIG_PM_RUNTIME is not set
# CONFIG_SUSPEND is not set

View File

@ -1,7 +1,9 @@
##
## file: arch/mips/Kconfig
##
## choice: System type
CONFIG_CAVIUM_OCTEON_SOC=y
## end choice
# CONFIG_HOTPLUG_CPU is not set
## choice: Kernel code model
# CONFIG_32BIT is not set