[kernel] r20159 - dists/sid/linux/debian/config/armel

[Arnaud Patard]

Author: rtp-guest
Date: Fri May 31 22:02:49 2013
New Revision: 20159

Log:
update kirkwood configuration

Modified:
   dists/sid/linux/debian/config/armel/config
   dists/sid/linux/debian/config/armel/config.kirkwood

Modified: dists/sid/linux/debian/config/armel/config
==============================================================================
--- dists/sid/linux/debian/config/armel/config	Fri May 31 22:02:12 2013	(r20158)
+++ dists/sid/linux/debian/config/armel/config	Fri May 31 22:02:49 2013	(r20159)
@@ -106,6 +106,12 @@
 # CONFIG_SCSI_QLA_ISCSI is not set
 
 ##
+## file: drivers/thermal/Kconfig
+##
+CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=m
+
+##
 ## file: drivers/virtio/Kconfig
 ##
 # CONFIG_VIRTIO_PCI is not set

Modified: dists/sid/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux/debian/config/armel/config.kirkwood	Fri May 31 22:02:12 2013	(r20158)
+++ dists/sid/linux/debian/config/armel/config.kirkwood	Fri May 31 22:02:49 2013	(r20159)
@@ -58,9 +58,25 @@
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
 CONFIG_MACH_GURUPLUG=y
 CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_MACH_GURUPLUG_DT=y
 CONFIG_MACH_DREAMPLUG_DT=y
 CONFIG_MACH_ICONNECT_DT=y
+CONFIG_MACH_DLINK_KIRKWOOD_DT=y
+CONFIG_MACH_IB62X0_DT=y
+CONFIG_MACH_TS219_DT=y
+CONFIG_MACH_DOCKSTAR_DT=y
+CONFIG_MACH_GOFLEXNET_DT=y
+CONFIG_MACH_LSXL_DT=y
+CONFIG_MACH_IOMEGA_IX2_200_DT=y
+CONFIG_MACH_KM_KIRKWOOD_DT=y
+CONFIG_MACH_INETSPACE_V2_DT=y
+CONFIG_MACH_MPLCEC4_DT=y
+CONFIG_MACH_NETSPACE_V2_DT=y
+CONFIG_MACH_NETSPACE_MAX_V2_DT=y
+CONFIG_MACH_NETSPACE_LITE_V2_DT=y
+CONFIG_MACH_NETSPACE_MINI_V2_DT=y
 CONFIG_MACH_OPENBLOCKS_A6_DT=y
+CONFIG_MACH_TOPKICK_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_DOCKSTAR=y
@@ -74,6 +90,7 @@
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
+CONFIG_MACH_NSA310_DT=y
 
 ##
 ## file: arch/arm/mm/Kconfig
@@ -488,6 +505,12 @@
 # CONFIG_PCCARD is not set
 
 ##
+## file: drivers/power/Kconfig
+##
+CONFIG_POWER_RESET_QNAP=y
+CONFIG_POWER_RESET_RESTART=y
+
+##
 ## file: drivers/rtc/Kconfig
 ##
 CONFIG_RTC_DRV_S35390A=y
@@ -572,6 +595,11 @@
 CONFIG_FB_XGI=m
 
 ##
+## file: drivers/thermal/Kconfig
+##
+CONFIG_KIRKWOOD_THERMAL=m
+
+##
 ## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_OF_PLATFORM=y