[kernel] r19520 - in dists/trunk/linux/debian/config: . kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed Nov 21 17:46:44 2012
New Revision: 19520

Log:
debian/config: Move Xen options to main config.

Modified:
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Wed Nov 21 17:39:18 2012	(r19519)
+++ dists/trunk/linux/debian/config/config	Wed Nov 21 17:46:44 2012	(r19520)
@@ -236,6 +236,8 @@
 CONFIG_BLK_DEV_RAM_COUNT=16
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
@@ -757,6 +759,7 @@
 CONFIG_INPUT_WM831X_ON=m
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_CMA3000 is not set
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/mouse/Kconfig
@@ -1698,6 +1701,8 @@
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 
 ##
@@ -2405,6 +2410,7 @@
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_PCI_IOV=y
 
 ##
@@ -2922,6 +2928,11 @@
 # CONFIG_TRACE_SINK is not set
 
 ##
+## file: drivers/tty/hvc/Kconfig
+##
+CONFIG_HVC_XEN=y
+
+##
 ## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_MAX3100=m
@@ -3176,6 +3187,7 @@
 # CONFIG_FB_TMIO is not set
 CONFIG_FB_SM501=m
 CONFIG_FB_UDL=m
+CONFIG_XEN_FBDEV_FRONTEND=y
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 ## choice: GDC variant
@@ -3267,6 +3279,19 @@
 CONFIG_XEN_WDT=m
 
 ##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+
+##
 ## file: fs/Kconfig
 ##
 CONFIG_CUSE=m

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Wed Nov 21 17:39:18 2012	(r19519)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Wed Nov 21 17:46:44 2012	(r19520)
@@ -241,8 +241,6 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_BLKDEV_BACKEND=m
 
 ##
 ## file: drivers/block/paride/Kconfig
@@ -587,7 +585,6 @@
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/mouse/Kconfig
@@ -817,8 +814,6 @@
 CONFIG_NET_FC=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_SB1000=m
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_BACKEND=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -1064,7 +1059,6 @@
 ##
 ## file: drivers/pci/Kconfig
 ##
-CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
 
 ##
@@ -1418,11 +1412,6 @@
 CONFIG_N_HDLC=m
 
 ##
-## file: drivers/tty/hvc/Kconfig
-##
-CONFIG_HVC_XEN=y
-
-##
 ## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_JSM=m
@@ -1518,7 +1507,6 @@
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=y
 
 ##
 ## file: drivers/video/backlight/Kconfig
@@ -1572,19 +1560,6 @@
 CONFIG_USBPCWATCHDOG=m
 
 ##
-## file: drivers/xen/Kconfig
-##
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
-CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-CONFIG_XEN_SYS_HYPERVISOR=y
-CONFIG_XEN_GNTDEV=m
-CONFIG_XEN_GRANT_DEV_ALLOC=m
-
-##
 ## file: fs/proc/Kconfig
 ##
 CONFIG_PROC_VMCORE=y