[kernel] r22267 - in dists/trunk/linux/debian/config: armel armhf

Ben Hutchings benh at moszumanska.debian.org
Fri Jan 16 02:47:58 UTC 2015 

Author: benh
Date: Fri Jan 16 02:47:58 2015
New Revision: 22267

Log:
Clean up kconfig files

Modified:
   dists/trunk/linux/debian/config/armel/config-reduced
   dists/trunk/linux/debian/config/armel/config.kirkwood
   dists/trunk/linux/debian/config/armel/config.orion5x
   dists/trunk/linux/debian/config/armhf/config.armmp

Modified: dists/trunk/linux/debian/config/armel/config-reduced
==============================================================================
--- dists/trunk/linux/debian/config/armel/config-reduced	Fri Jan 16 02:46:52 2015	(r22266)
+++ dists/trunk/linux/debian/config/armel/config-reduced	Fri Jan 16 02:47:58 2015	(r22267)
@@ -68,3 +68,4 @@
 ##
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
+

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Fri Jan 16 02:46:52 2015	(r22266)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Fri Jan 16 02:47:58 2015	(r22267)
@@ -22,7 +22,9 @@
 ##
 ## file: arch/arm/Kconfig.debug
 ##
+## choice: Kernel low-level debugging port
 CONFIG_DEBUG_MVEBU_UART_ALTERNATE=y
+## end choice
 
 ##
 ## file: arch/arm/mach-imx/Kconfig

Modified: dists/trunk/linux/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.orion5x	Fri Jan 16 02:46:52 2015	(r22266)
+++ dists/trunk/linux/debian/config/armel/config.orion5x	Fri Jan 16 02:47:58 2015	(r22267)
@@ -205,6 +205,15 @@
 CONFIG_KEYBOARD_GPIO=m
 
 ##
+## file: drivers/input/serio/Kconfig
+##
+CONFIG_SERIO=m
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO_RAW is not set
+
+##
 ## file: drivers/input/touchscreen/Kconfig
 ##
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -487,15 +496,6 @@
 # CONFIG_SCSI_UFSHCD is not set
 
 ##
-## file: drivers/input/serio/Kconfig
-##
-CONFIG_SERIO=m
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=m
-# CONFIG_SERIO_RAW is not set
-
-##
 ## file: drivers/ssb/Kconfig
 ##
 # CONFIG_SSB is not set

Modified: dists/trunk/linux/debian/config/armhf/config.armmp
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.armmp	Fri Jan 16 02:46:52 2015	(r22266)
+++ dists/trunk/linux/debian/config/armhf/config.armmp	Fri Jan 16 02:47:58 2015	(r22267)
@@ -189,6 +189,12 @@
 CONFIG_TI_CPPI41=m
 
 ##
+## file: drivers/extcon/Kconfig
+##
+CONFIG_EXTCON=m
+CONFIG_EXTCON_PALMAS=m
+
+##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIO_SYSFS=y
@@ -215,11 +221,6 @@
 CONFIG_DRM_OMAP=m
 
 ##
-## file: drivers/gpu/drm/panel/Kconfig
-##
-# CONFIG_DRM_PANEL is not set
-
-##
 ## file: drivers/gpu/drm/tegra/Kconfig
 ##
 CONFIG_DRM_TEGRA=m
@@ -397,7 +398,7 @@
 CONFIG_IR_GPIO_CIR=m
 
 ##
-## drivers/memory/Kconfig
+## file: drivers/memory/Kconfig
 ##
 CONFIG_TI_EMIF=m
 
@@ -411,8 +412,8 @@
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_TWL6040_CORE=y
 CONFIG_MFD_PALMAS=y
+CONFIG_TWL6040_CORE=y
 
 ##
 ## file: drivers/misc/Kconfig
@@ -644,8 +645,6 @@
 CONFIG_PINCTRL_AS3722=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_PALMAS=y
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA124=y
 
 ##
 ## file: drivers/pinctrl/vt8500/Kconfig
@@ -689,20 +688,21 @@
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_PALMAS=y
+CONFIG_REGULATOR_PBIAS=m
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_VEXPRESS=m
-CONFIG_REGULATOR_PBIAS=m
-CONFIG_REGULATOR_TI_ABB=m
-CONFIG_REGULATOR_PALMAS=y
 
 ##
 ## file: drivers/rtc/Kconfig
 ##
 CONFIG_RTC_DRV_AS3722=y
 CONFIG_RTC_DRV_ISL12057=y
+CONFIG_RTC_DRV_PALMAS=y
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DA9052=y
@@ -714,10 +714,9 @@
 CONFIG_RTC_DRV_SUNXI=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_RTC_DRV_MC13XXX=y
+CONFIG_RTC_DRV_TEGRA=y
 CONFIG_RTC_DRV_MXC=y
 CONFIG_RTC_DRV_SNVS=y
-CONFIG_RTC_DRV_PALMAS=y
-CONFIG_RTC_DRV_TEGRA=y
 
 ##
 ## file: drivers/scsi/Kconfig
@@ -774,6 +773,7 @@
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_VT8500=y
@@ -784,7 +784,6 @@
 CONFIG_SERIAL_ARC=y
 CONFIG_SERIAL_ARC_CONSOLE=y
 CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_TEGRA=y
 
 ##
 ## file: drivers/tty/serial/8250/Kconfig
@@ -829,22 +828,14 @@
 CONFIG_USB_GADGET=y
 
 ##
-## file: drivers/usb/gadget/legacy/Kconfig
-##
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_G_NOKIA=m
-
-##
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_EXYNOS=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_OHCI_EXYNOS=m
@@ -892,6 +883,8 @@
 ##
 ## file: drivers/video/fbdev/omap2/displays-new/Kconfig
 ##
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
 CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
 
 ##
@@ -904,13 +897,6 @@
 CONFIG_OMAP2_DSS_SDI=y
 
 ##
-## file: drivers/video/fbdev/omap2/displays-new/Kconfig
-##
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-
-##
 ## file: drivers/video/fbdev/omap2/omapfb/Kconfig
 ##
 CONFIG_FB_OMAP2=m
@@ -949,7 +935,6 @@
 ##
 CONFIG_SND_HDA_TEGRA=m
 
-
 ##
 ## file: sound/soc/Kconfig
 ##
@@ -981,7 +966,13 @@
 CONFIG_SND_SOC_TEGRA=m
 
 ##
-## file: drivers/extcon/Kconfig
+## file: unknown
 ##
-CONFIG_EXTCON=m
-CONFIG_EXTCON_PALMAS=m
+# CONFIG_DRM_PANEL is not set
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_G_NOKIA=m
+

More information about the Kernel-svn-changes mailing list