[kernel] r13655 - in dists/trunk/linux-2.6/debian/config: amd64 i386 kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed May 20 15:52:55 2009
New Revision: 13655

Log:
* debian/config/amd64/config, debian/config/i386/config:
  Remove Xen options.
* debian/config/kernelarch-x86/config: Add Xen options.

Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 15:42:39 2009	(r13654)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 15:52:55 2009	(r13655)
@@ -57,7 +57,6 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
 
 ##
 ## file: drivers/block/paride/Kconfig
@@ -120,7 +119,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -369,7 +367,6 @@
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
-CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -717,7 +714,6 @@
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
-CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_FDDI=y
 CONFIG_SKFP=m
 CONFIG_HIPPI=y
@@ -1135,7 +1131,6 @@
 CONFIG_FB_VOODOO1=m
 CONFIG_FB_TRIDENT=m
 CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=y
 
 ##
 ## file: drivers/video/backlight/Kconfig
@@ -1193,14 +1188,6 @@
 CONFIG_USBPCWATCHDOG=m
 
 ##
-## file: drivers/xen/Kconfig
-##
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-
-##
 ## file: fs/partitions/Kconfig
 ##
 CONFIG_ACORN_PARTITION=y

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed May 20 15:42:39 2009	(r13654)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed May 20 15:52:55 2009	(r13655)
@@ -66,7 +66,6 @@
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
 
 ##
 ## file: drivers/block/paride/Kconfig
@@ -129,7 +128,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
-CONFIG_HVC_XEN=y
 CONFIG_NVRAM=m
 CONFIG_DTLK=m
 CONFIG_R3964=m
@@ -402,7 +400,6 @@
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
-CONFIG_XEN_KBDDEV_FRONTEND=y
 
 ##
 ## file: drivers/input/gameport/Kconfig
@@ -836,7 +833,6 @@
 CONFIG_ATP=m
 CONFIG_DE600=m
 CONFIG_DE620=m
-CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_FDDI=y
 CONFIG_SKFP=m
 CONFIG_HIPPI=y
@@ -1376,14 +1372,6 @@
 CONFIG_USBPCWATCHDOG=m
 
 ##
-## file: drivers/xen/Kconfig
-##
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XENFS=m
-CONFIG_XEN_COMPAT_XENFS=y
-
-##
 ## file: fs/Kconfig.binfmt
 ##
 CONFIG_BINFMT_AOUT=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May 20 15:42:39 2009	(r13654)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May 20 15:52:55 2009	(r13655)
@@ -132,6 +132,39 @@
 CONFIG_ACPI_SBS=m
 
 ##
+## file: drivers/block/Kconfig
+##
+CONFIG_XEN_BLKDEV_FRONTEND=m
+
+##
+## file: drivers/char/Kconfig
+##
+CONFIG_HVC_XEN=y
+
+##
+## file: drivers/input/Kconfig
+##
+CONFIG_XEN_KBDDEV_FRONTEND=y
+
+##
+## file: drivers/net/Kconfig
+##
+CONFIG_XEN_NETDEV_FRONTEND=m
+
+##
+## file: drivers/video/Kconfig
+##
+CONFIG_XEN_FBDEV_FRONTEND=y
+
+##
+## file: drivers/xen/Kconfig
+##
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+
+##
 ## file: unknown
 ##
 # CONFIG_PARAVIRT_SPINLOCKS is not set