diff --git a/debian/changelog b/debian/changelog index 9f726c02f..80dad0200 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux (3.12.1-1~exp1) UNRELEASED; urgency=low * [rt] Update to 3.12.0-rt2 and reenable * HID: Enable UHID as module (Closes: #729338) - HID: uhid: fix leak for 64/32 UHID_CREATE + * [sh4] Remove some accidental inconsistencies in config [ Bastian Blank ] * Use compiler name instead of Linux version in compiler meta-packages. diff --git a/debian/config/alpha/config b/debian/config/alpha/config index f84014a94..be993d6cf 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -216,8 +216,6 @@ CONFIG_DRM_NOUVEAU=m ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/armel/config b/debian/config/armel/config index d8833e15f..a12ea9494 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -110,11 +110,6 @@ CONFIG_YAM=m CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y -## -## file: drivers/tty/serial/8250/Kconfig -## -CONFIG_SERIAL_8250_PCI=m - ## ## file: drivers/virtio/Kconfig ## diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced index 821d6143b..7e775d17f 100644 --- a/debian/config/armel/config-reduced +++ b/debian/config/armel/config-reduced @@ -24,8 +24,6 @@ ## # CONFIG_AUDITSYSCALL is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_EXPERT=y -# CONFIG_SYSCTL_SYSCALL is not set #. Saves about 17K, and none of the quirks are likely to be needed # CONFIG_PCI_QUIRKS is not set @@ -59,3 +57,7 @@ CONFIG_IPV6=m ## # CONFIG_SECURITY_YAMA is not set +## +## file: usr/Kconfig +## +# CONFIG_RD_LZ4 is not set diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x index f01a0a3b9..696ee0f76 100644 --- a/debian/config/armel/config.iop32x +++ b/debian/config/armel/config.iop32x @@ -478,6 +478,7 @@ CONFIG_VT_CONSOLE=y ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=m CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx index da146293f..5f071b2d4 100644 --- a/debian/config/armel/config.ixp4xx +++ b/debian/config/armel/config.ixp4xx @@ -615,6 +615,7 @@ CONFIG_VT_CONSOLE=y ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=m CONFIG_SERIAL_8250_NR_UARTS=2 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 49bf3cef9..36a6f1c98 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -157,7 +157,6 @@ CONFIG_SATA_MV=m # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set -# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_ATA_GENERIC is not set @@ -580,7 +579,6 @@ CONFIG_SERIAL_OF_PLATFORM=y ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/debian/config/armel/config.mv78xx0 b/debian/config/armel/config.mv78xx0 index 0e93cba31..1e16e0d31 100644 --- a/debian/config/armel/config.mv78xx0 +++ b/debian/config/armel/config.mv78xx0 @@ -122,7 +122,6 @@ CONFIG_SATA_MV=m # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set -# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_ATA_GENERIC is not set @@ -479,7 +478,6 @@ CONFIG_RTC_DRV_S35390A=y ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 6ff26141c..910e78b47 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -136,7 +136,6 @@ CONFIG_SATA_MV=m # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set -# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_RZ1000 is not set # CONFIG_ATA_GENERIC is not set @@ -500,7 +499,6 @@ CONFIG_RTC_DRV_S35390A=y ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=2 # CONFIG_SERIAL_8250_EXTENDED is not set diff --git a/debian/config/config b/debian/config/config index 6273077ec..8bd26459b 100644 --- a/debian/config/config +++ b/debian/config/config @@ -194,6 +194,7 @@ CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PLATFORM is not set # CONFIG_PATA_PCMCIA is not set # CONFIG_PATA_QDI is not set # CONFIG_PATA_RZ1000 is not set @@ -298,6 +299,7 @@ CONFIG_BT_WILINK=m ## file: drivers/char/Kconfig ## # CONFIG_DEVKMEM is not set +# CONFIG_TTY_PRINTK is not set CONFIG_VIRTIO_CONSOLE=m # CONFIG_R3964 is not set CONFIG_PC8736x_GPIO=m @@ -336,6 +338,7 @@ CONFIG_CPU_FREQ_STAT=m # CONFIG_CPU_FREQ_STAT_DETAILS is not set ## choice: Default CPUFreq governor CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set @@ -468,6 +471,11 @@ CONFIG_DRM_UDL=m ## # CONFIG_DRM_VMWGFX is not set +## +## file: drivers/gpu/vga/Kconfig +## +CONFIG_VGA_ARB=y + ## ## file: drivers/hid/Kconfig ## @@ -475,21 +483,21 @@ CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_UHID=m CONFIG_HID_GENERIC=m -CONFIG_HID_A4TECH=m +CONFIG_HID_A4TECH=y CONFIG_HID_ACRUX=m CONFIG_HID_ACRUX_FF=y -CONFIG_HID_APPLE=m +CONFIG_HID_APPLE=y CONFIG_HID_AUREAL=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m +CONFIG_HID_BELKIN=y +CONFIG_HID_CHERRY=y +CONFIG_HID_CHICONY=y CONFIG_HID_PRODIKEYS=m -CONFIG_HID_CYPRESS=m +CONFIG_HID_CYPRESS=y CONFIG_HID_DRAGONRISE=m CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m -CONFIG_HID_EZKEY=m +CONFIG_HID_EZKEY=y CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y CONFIG_HID_HUION=m @@ -500,18 +508,18 @@ CONFIG_HID_WALTOP=m CONFIG_HID_GYRATION=m CONFIG_HID_ICADE=m CONFIG_HID_TWINHAN=m -CONFIG_HID_KENSINGTON=m +CONFIG_HID_KENSINGTON=y CONFIG_HID_LCPOWER=m CONFIG_HID_LENOVO_TPKBD=m -CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH=y CONFIG_HID_LOGITECH_DJ=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y CONFIG_LOGIWHEELS_FF=y CONFIG_HID_MAGICMOUSE=m -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m +CONFIG_HID_MICROSOFT=y +CONFIG_HID_MONTEREY=y CONFIG_HID_MULTITOUCH=m CONFIG_HID_NTRIG=m CONFIG_HID_ORTEK=m @@ -553,6 +561,9 @@ CONFIG_HID_SENSOR_HUB=m ## CONFIG_HID_PID=y CONFIG_USB_HIDDEV=y +#. These are for HID Boot Protocol, not full HID +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set ## ## file: drivers/hsi/Kconfig @@ -927,6 +938,7 @@ CONFIG_JOYSTICK_IFORCE_232=y ## ## file: drivers/input/keyboard/Kconfig ## +CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ADP5588=m # CONFIG_KEYBOARD_ADP5589 is not set # CONFIG_KEYBOARD_QT1070 is not set @@ -971,6 +983,11 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y ## file: drivers/input/mouse/Kconfig ## CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_CYPRESS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set @@ -1038,6 +1055,15 @@ CONFIG_TOUCHSCREEN_USB_ETURBO=y CONFIG_TOUCHSCREEN_USB_GUNZE=y CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_TOUCHIT213=m # CONFIG_TOUCHSCREEN_TSC2005 is not set @@ -2657,6 +2683,7 @@ CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set @@ -3234,6 +3261,7 @@ CONFIG_SPI_LM70_LLP=m ## file: drivers/ssb/Kconfig ## CONFIG_SSB=m +# CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set ## @@ -3410,6 +3438,10 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y ## ## file: drivers/tty/Kconfig ## +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y @@ -3450,6 +3482,7 @@ CONFIG_SERIAL_RP2_NR_UARTS=32 ## # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_DMA=y CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_FOURPORT=m CONFIG_SERIAL_8250_ACCENT=m @@ -3862,6 +3895,7 @@ CONFIG_XEN_PCIDEV_BACKEND=m ## ## file: fs/Kconfig ## +CONFIG_FILE_LOCKING=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_HUGETLBFS=y @@ -3936,6 +3970,7 @@ CONFIG_BINFMT_ELF=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y ## ## file: fs/btrfs/Kconfig @@ -4292,8 +4327,10 @@ CONFIG_OMFS_FS=m ## ## file: fs/proc/Kconfig ## +CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y ## ## file: fs/pstore/Kconfig @@ -4353,6 +4390,11 @@ CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set +## +## file: fs/sysfs/Kconfig +## +CONFIG_SYSFS=y + ## ## file: fs/sysv/Kconfig ## @@ -4451,19 +4493,25 @@ CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_EXPERT is not set -CONFIG_SYSCTL_SYSCALL=y +#. Unfortunately some useful options are conditional on EXPERT +CONFIG_EXPERT=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y +CONFIG_PCSPKR_PLATFORM=y +CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_PCI_QUIRKS=y # CONFIG_EMBEDDED is not set CONFIG_PERF_EVENTS=y # CONFIG_DEBUG_PERF_USE_VMALLOC is not set @@ -4474,6 +4522,7 @@ CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set ## end choice +# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set CONFIG_PROFILING=y CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y @@ -5000,7 +5049,13 @@ CONFIG_LLC2=m ## file: net/mac80211/Kconfig ## CONFIG_MAC80211=m +# CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +## choice: Default rate control algorithm +# CONFIG_MAC80211_RC_DEFAULT_PID is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +## end choice CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set @@ -5327,8 +5382,10 @@ CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y # CONFIG_LIB80211_DEBUG is not set @@ -5547,8 +5604,9 @@ CONFIG_SND_USB_6FIRE=m ## file: usr/Kconfig ## CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y CONFIG_RD_BZIP2=y CONFIG_RD_LZMA=y CONFIG_RD_XZ=y CONFIG_RD_LZO=y - +CONFIG_RD_LZ4=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 012eb8fe6..c65bc2cf9 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -81,8 +81,6 @@ CONFIG_EISA_NAMES=y ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/ia64/config b/debian/config/ia64/config index fa12fe704..3645acc38 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -187,8 +187,6 @@ CONFIG_DRM_NOUVEAU=m ## CONFIG_USB_HID=m # CONFIG_HID_PID is not set -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 2de2487df..3d02ed873 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -7,6 +7,7 @@ CONFIG_OPROFILE=m ## ## file: arch/x86/Kconfig ## +CONFIG_ZONE_DMA=y CONFIG_X86_MPPARSE=y # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_INTEL_LPSS is not set @@ -19,6 +20,8 @@ CONFIG_KVM_GUEST=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_MEMTEST=y CONFIG_HPET_TIMER=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -41,6 +44,8 @@ CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y +CONFIG_ARCH_RANDOM=y +CONFIG_X86_SMAP=y CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_SECCOMP=y @@ -55,22 +60,29 @@ CONFIG_HOTPLUG_CPU=y # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_PCI=y -CONFIG_PCI_CNB20LE_QUIRK=y +# CONFIG_PCI_CNB20LE_QUIRK is not set # CONFIG_RAPIDIO is not set CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=y +## +## file: arch/x86/Kconfig.cpu +## +# CONFIG_PROCESSOR_SELECT is not set + ## ## file: arch/x86/Kconfig.debug ## CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y +CONFIG_EARLY_PRINTK=y # CONFIG_EARLY_PRINTK_DBGP is not set # CONFIG_X86_PTDUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set +CONFIG_DOUBLEFAULT=y # CONFIG_DEBUG_TLBFLUSH is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set @@ -154,6 +166,7 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=y CONFIG_ACPI_HOTPLUG_MEMORY=y CONFIG_ACPI_SBS=m @@ -383,6 +396,7 @@ CONFIG_EDAC_AMD8111=m ## CONFIG_EDD=m # CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y @@ -469,8 +483,6 @@ CONFIG_I2C_HID=m ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m ## ## file: drivers/hv/Kconfig diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32 index 21bee55f1..8744a28f9 100644 --- a/debian/config/kernelarch-x86/config-arch-32 +++ b/debian/config/kernelarch-x86/config-arch-32 @@ -13,6 +13,13 @@ CONFIG_X86_REBOOTFIXUPS=y CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set ## end choice +## choice: Memory split +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_2G_OPT is not set +# CONFIG_VMSPLIT_1G is not set +## end choice # CONFIG_X86_PAE is not set # CONFIG_NUMA is not set CONFIG_HIGHPTE=y diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 8ba4171ae..190948cc4 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -8,11 +8,13 @@ CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=512 +CONFIG_DIRECT_GBPAGES=y CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_NUMA_EMU=y CONFIG_PCI_MMCONFIG=y +CONFIG_ISA_DMA_API=y ## ## file: arch/x86/Kconfig.cpu diff --git a/debian/config/m68k/config b/debian/config/m68k/config index 7331d89c2..4193c80b5 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -179,7 +179,7 @@ CONFIG_BLK_DEV_Q40IDE=m ## ## file: drivers/input/Kconfig ## -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y ## ## file: drivers/input/gameport/Kconfig @@ -252,12 +252,7 @@ CONFIG_INPUT_UINPUT=m ## CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set # CONFIG_MOUSE_PS2_LIFEBOOK is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set diff --git a/debian/config/mips/config b/debian/config/mips/config index bed32cfff..c9e43ed35 100644 --- a/debian/config/mips/config +++ b/debian/config/mips/config @@ -8,3 +8,7 @@ CONFIG_CPU_BIG_ENDIAN=y CONFIG_KEXEC=y # CONFIG_RAPIDIO is not set +## +## file: arch/mips/Kconfig.debug +## +CONFIG_EARLY_PRINTK=y diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index af54ce1d4..a14b2f7d3 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -120,7 +120,6 @@ CONFIG_PATA_PDC_OLD=y CONFIG_PATA_SIL680=y CONFIG_PATA_MPIIX=y CONFIG_PATA_NS87410=y -CONFIG_PATA_PLATFORM=y CONFIG_ATA_GENERIC=y ## @@ -897,7 +896,6 @@ CONFIG_SERIAL_JSM=m ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index a6a230ff4..2f3920796 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -123,7 +123,6 @@ CONFIG_PATA_PDC_OLD=y CONFIG_PATA_SIL680=y CONFIG_PATA_MPIIX=y CONFIG_PATA_NS87410=y -CONFIG_PATA_PLATFORM=y CONFIG_ATA_GENERIC=y ## @@ -901,7 +900,6 @@ CONFIG_SERIAL_JSM=m ## CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_PCI=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index 8aa759369..95c616df0 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -128,12 +128,6 @@ CONFIG_PRINTER=m ## # CONFIG_DRM is not set -## -## file: drivers/hid/usbhid/Kconfig -## -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m - ## ## file: drivers/hwmon/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index e825e0191..6925135f7 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -192,8 +192,6 @@ CONFIG_GEN_RTC_X=y ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index efb855d22..b3e85f66d 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -143,7 +143,6 @@ CONFIG_PATA_SIL680=m CONFIG_PATA_TRIFLEX=m CONFIG_PATA_VIA=m CONFIG_PATA_MPIIX=m -CONFIG_PATA_PLATFORM=y ## ## file: drivers/block/Kconfig @@ -193,8 +192,6 @@ CONFIG_GEN_RTC_X=y ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt index bade9e676..3ae742d5b 100644 --- a/debian/config/mipsel/config.r5k-cobalt +++ b/debian/config/mipsel/config.r5k-cobalt @@ -83,7 +83,6 @@ CONFIG_MSDOS_PARTITION=y ## CONFIG_ATA=y CONFIG_PATA_VIA=y -CONFIG_PATA_PLATFORM=y ## ## file: drivers/base/Kconfig @@ -136,8 +135,6 @@ CONFIG_PATA_PLATFORM=y ## file: drivers/hid/usbhid/Kconfig ## # CONFIG_USB_HID is not set -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 53db20f86..215a98c35 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -217,8 +217,6 @@ CONFIG_HID_APPLEIR=m ## file: drivers/hid/usbhid/Kconfig ## CONFIG_USB_HID=m -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set ## ## file: drivers/hwmon/Kconfig diff --git a/debian/config/s390x/config b/debian/config/s390x/config index c664c09b9..cdea30355 100644 --- a/debian/config/s390x/config +++ b/debian/config/s390x/config @@ -142,6 +142,11 @@ CONFIG_HVC_IUCV=y ## CONFIG_ZVM_WATCHDOG=m +## +## file: init/Kconfig +## +# CONFIG_PCI_QUIRKS is not set + ## ## file: mm/Kconfig ##