[PATCH] UBUNTU: [Config] disable LGUEST_GUEST

[Ike Panhc]

Commit 434e71 'virtio: explicit advertisement of driver features' which add a
new inline function virtio_has_feature() in include/linux/virtio_config.h
causes compile failed when CONFIG_LGUEST_GUEST=y.

Since lguest is not used with netbook kernel and disabled in master branch, it
is good to disable in config.

There are five VIRTIO related configs has been removed due to that they are
enabled only because of lguest.

Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
 debian/binary-custom.d/lpia/config.lpia |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/debian/binary-custom.d/lpia/config.lpia b/debian/binary-custom.d/lpia/config.lpia
index d575dd5..9133077 100644
--- a/debian/binary-custom.d/lpia/config.lpia
+++ b/debian/binary-custom.d/lpia/config.lpia
@@ -153,7 +153,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_VMI=y
-CONFIG_LGUEST_GUEST=y
+# CONFIG_LGUEST_GUEST is not set
 # CONFIG_M386 is not set
 # CONFIG_M486 is not set
 CONFIG_M586=y
@@ -1123,7 +1123,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
 # CONFIG_MISC_DEVICES is not set
 CONFIG_EEPROM_93CX6=m
 CONFIG_IDE=y
@@ -1695,7 +1694,6 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
 CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
 # CONFIG_ISDN is not set
 CONFIG_PHONE=m
 CONFIG_PHONE_IXJ=m
@@ -1879,7 +1877,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_PRINTER is not set
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -3306,8 +3303,6 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_HAVE_KVM=y
 # CONFIG_VIRTUALIZATION is not set
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
 
 #
 # Library routines
-- 
1.7.0.4