From 4ff7e6d39ed9cec1b6660d0168f25988f6172edc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 1 Sep 2013 02:52:56 +0000 Subject: [PATCH] Enable many new(ish) config options svn path=/dists/trunk/linux/; revision=20541 --- debian/changelog | 24 ++++++++++ debian/config/armel/config-reduced | 5 +++ debian/config/config | 50 +++++++++++++++++++++ debian/config/kernelarch-x86/config | 10 ++++- debian/config/kernelarch-x86/config-arch-64 | 2 + 5 files changed, 90 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8bca2f11e..eb6a329ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,30 @@ linux (3.11~rc7-1~exp1) UNRELEASED; urgency=low (Fernando Ike de Oliveira) (Closes: #719725) * hid: Enable HID_HUION as module (Closes: #721002) * [powerpc,x86] hid: Enable HID_APPLEIR as module + * ACPI: Enable ACPI_INITRD_TABLE_OVERRIDE (Closes: #721310) + * net: Enable NET_MPLS_GSO + * nfc: Enable NFC_SIM as module + * md: Enable DM_SWITCH as module + * net: Enable NLMON as module + * wireless: Enable ATH10K, ATH10K_PCI as modules + * media: Enable VIDEO_USBTV as module + * video: Enable FB_SMSCUFX as module + * usb/serial: Enable USB_SERIAL_WISHBONE, USB_SERIAL_FLASHLOADER, + USB_SERIAL_SUUNTO as modules + * infiniband: Enable MLX5_INFINIBAND, INFINIBAND_ISERT as modules + * xen: Enable XEN_BALLOON_MEMORY_HOTPLUG + * fs: Enable QNX6FS_FS as module + * f2fs: Enable F2FS_FS_SECURITY + * 9p: Enable 9P_FS_SECURITY + * sunrpc: Enable SUNRPC_DEBUG + * vhost: Enable VHOST_SCSI as module + * [x86] video: Enable FB_HYPERV as module + * [x86] snd-hda-intel: Enable SND_HDA_I915 + * [x86] mmc: Enable MMC_SDHCI_ACPI as module + * [x86] comedi: Enable COMEDI_ADV_PCI1724, COMEDI_NI_LABPC_PCI (formerly + COMEDI_NI_LABPC) as modules + * [amd64] iommu: Enable AMD_IOMMU_V2 + * [x86,ia64] fs: Enable EFIVAR_FS as module -- Ben Hutchings Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/config/armel/config-reduced b/debian/config/armel/config-reduced index b6933e3db..0d64c6834 100644 --- a/debian/config/armel/config-reduced +++ b/debian/config/armel/config-reduced @@ -47,6 +47,11 @@ CONFIG_EXPERT=y ## CONFIG_IPV6=m +## +## file: net/mpls/Kconfig +## +# CONFIG_NET_MPLS_GSO is not set + ## ## file: net/netlink/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 8b7b2ad82..8091708e5 100644 --- a/debian/config/config +++ b/debian/config/config @@ -118,6 +118,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y ## ## file: drivers/acpi/Kconfig ## +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y # CONFIG_ACPI_BGRT is not set ## @@ -807,6 +808,11 @@ CONFIG_INFINIBAND_IPATH=m ## CONFIG_MLX4_INFINIBAND=m +## +## file: drivers/infiniband/hw/mlx5/Kconfig +## +CONFIG_MLX5_INFINIBAND=m + ## ## file: drivers/infiniband/hw/mthca/Kconfig ## @@ -843,6 +849,11 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y ## CONFIG_INFINIBAND_ISER=m +## +## file: drivers/infiniband/ulp/isert/Kconfig +## +CONFIG_INFINIBAND_ISERT=m + ## ## file: drivers/infiniband/ulp/srp/Kconfig ## @@ -1137,6 +1148,7 @@ CONFIG_DM_DELAY=m CONFIG_DM_UEVENT=y CONFIG_DM_FLAKEY=m CONFIG_DM_VERITY=m +CONFIG_DM_SWITCH=m ## ## file: drivers/md/bcache/Kconfig @@ -1720,6 +1732,11 @@ CONFIG_DVB_TTUSB_BUDGET=m ## CONFIG_DVB_TTUSB_DEC=m +## +## file: drivers/media/usb/usbtv/Kconfig +## +CONFIG_VIDEO_USBTV=m + ## ## file: drivers/media/usb/usbvision/Kconfig ## @@ -1999,6 +2016,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_TUN=m CONFIG_VETH=m CONFIG_VIRTIO_NET=m +CONFIG_NLMON=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2589,6 +2607,12 @@ CONFIG_ATH_CARDS=y ## CONFIG_AR5523=m +## +## file: drivers/net/wireless/ath/ath10k/Kconfig +## +CONFIG_ATH10K=m +CONFIG_ATH10K_PCI=m + ## ## file: drivers/net/wireless/ath/ath5k/Kconfig ## @@ -2808,6 +2832,7 @@ CONFIG_ZD1211RW=m ## file: drivers/nfc/Kconfig ## CONFIG_NFC_PN533=m +CONFIG_NFC_SIM=m ## ## file: drivers/of/Kconfig @@ -3617,9 +3642,12 @@ CONFIG_USB_SERIAL_OPTICON=m CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m CONFIG_USB_SERIAL_XSENS_MT=m CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_ZTE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m +CONFIG_USB_SERIAL_FLASHLOADER=m +CONFIG_USB_SERIAL_SUUNTO=m CONFIG_USB_SERIAL_DEBUG=m ## @@ -3659,6 +3687,7 @@ CONFIG_UWB_I1480U=m ## file: drivers/vhost/Kconfig ## CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m ## ## file: drivers/video/Kconfig @@ -3684,6 +3713,7 @@ CONFIG_FB_PM3=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_TMIO is not set CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m CONFIG_FB_UDL=m # CONFIG_FB_GOLDFISH is not set CONFIG_XEN_FBDEV_FRONTEND=y @@ -3788,6 +3818,7 @@ CONFIG_XEN_WDT=m ## file: drivers/xen/Kconfig ## CONFIG_XEN_BALLOON=y +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y @@ -3813,6 +3844,7 @@ CONFIG_NETWORK_FILESYSTEMS=y CONFIG_9P_FS=m CONFIG_9P_FSCACHE=y CONFIG_9P_FS_POSIX_ACL=y +CONFIG_9P_FS_SECURITY=y ## ## file: fs/adfs/Kconfig @@ -3939,6 +3971,11 @@ CONFIG_DLM_DEBUG=y ## CONFIG_ECRYPT_FS=m +## +## file: fs/efivarfs/Kconfig +## +CONFIG_EFIVAR_FS=m + ## ## file: fs/efs/Kconfig ## @@ -3983,6 +4020,7 @@ CONFIG_F2FS_FS=m CONFIG_F2FS_STAT_FS=y CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y ## ## file: fs/fat/Kconfig @@ -4244,6 +4282,11 @@ CONFIG_PSTORE_RAM=m ## CONFIG_QNX4FS_FS=m +## +## file: fs/qnx6/Kconfig +## +CONFIG_QNX6FS_FS=m + ## ## file: fs/quota/Kconfig ## @@ -4931,6 +4974,12 @@ CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_MAC80211_DEBUG_MENU is not set +## +## file: net/mpls/Kconfig +## +#. Can be built as a module, but nothing will trigger loading +CONFIG_NET_MPLS_GSO=y + ## ## file: net/netfilter/Kconfig ## @@ -5216,6 +5265,7 @@ CONFIG_SCTP_COOKIE_HMAC_SHA1=y ## file: net/sunrpc/Kconfig ## CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y ## ## file: net/tipc/Kconfig diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 4ececc496..9c7120217 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -766,6 +766,11 @@ CONFIG_MMC=m ## CONFIG_MMC_BLOCK=m +## +## file: drivers/mmc/host/Kconfig +## +CONFIG_MMC_SDHCI_ACPI=m + ## ## file: drivers/mtd/Kconfig ## @@ -1295,6 +1300,7 @@ CONFIG_COMEDI_ADL_PCI9111=m CONFIG_COMEDI_ADL_PCI9118=m CONFIG_COMEDI_ADV_PCI1710=m CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI1724=m CONFIG_COMEDI_ADV_PCI_DIO=m CONFIG_COMEDI_AMPLC_DIO200_PCI=m CONFIG_COMEDI_AMPLC_PC236_PCI=m @@ -1323,7 +1329,7 @@ CONFIG_COMEDI_NI_6527=m CONFIG_COMEDI_NI_65XX=m CONFIG_COMEDI_NI_660X=m CONFIG_COMEDI_NI_670X=m -CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_NI_LABPC_PCI=m CONFIG_COMEDI_NI_PCIDIO=m CONFIG_COMEDI_NI_PCIMIO=m CONFIG_COMEDI_RTD520=m @@ -1573,6 +1579,7 @@ CONFIG_FB_KYRO=m CONFIG_FB_VOODOO1=m CONFIG_FB_TRIDENT=m CONFIG_FB_VIRTUAL=m +CONFIG_FB_HYPERV=m ## ## file: drivers/video/console/Kconfig @@ -1793,6 +1800,7 @@ CONFIG_SND_YMFPCI=m ## file: sound/pci/hda/Kconfig ## CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_I915=y ## ## file: unknown diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index 8a950f659..105fbce27 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -80,6 +80,8 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y ## CONFIG_AMD_IOMMU=y # CONFIG_AMD_IOMMU_STATS is not set +#. Can be built as a module, but nothing will trigger loading +CONFIG_AMD_IOMMU_V2=y ## ## file: drivers/macintosh/Kconfig