* debian/config/amd64/config, debian/config/i386/config:

Remove Xen options.
* debian/config/kernelarch-x86/config: Add Xen options.

svn path=/dists/trunk/linux-2.6/; revision=13655
This commit is contained in:
Bastian Blank 2009-05-20 15:52:55 +00:00
parent 370c49c7c4
commit 6df9474554
3 changed files with 33 additions and 25 deletions

View File

@ -57,7 +57,6 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
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_STALDRV=y
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_X=1024
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_VIA_RHINE=m
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_KYRO=m
CONFIG_FB_VOODOO1=m
CONFIG_FB_TRIDENT=m
CONFIG_FB_VIRTUAL=m
CONFIG_XEN_FBDEV_FRONTEND=y
##
## file: drivers/video/backlight/Kconfig
@ -1192,14 +1187,6 @@ CONFIG_WDTPCI=m
CONFIG_WDT_501_PCI=y
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
##

View File

@ -66,7 +66,6 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
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_STALDRV=y
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_X=1024
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_VIA_RHINE=m
CONFIG_ATP=m
CONFIG_DE600=m
CONFIG_DE620=m
CONFIG_XEN_NETDEV_FRONTEND=m
CONFIG_FDDI=y
CONFIG_SKFP=m
CONFIG_HIPPI=y
@ -1375,14 +1371,6 @@ CONFIG_WDTPCI=m
CONFIG_WDT_501_PCI=y
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
##

View File

@ -131,6 +131,39 @@ CONFIG_ACPI_CONTAINER=m
CONFIG_ACPI_HOTPLUG_MEMORY=m
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
##