From ec0ee0bec9c45d1c983cc97f2da4f71cac770e41 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 26 Jun 2007 23:03:45 +0000
Subject: linux-rp: Sync up/cleanup with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2014 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86')

diff --git a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86
index b6b84aa87..08e0a0c6c 100644
--- a/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.21/defconfig-qemux86
@@ -428,7 +428,6 @@ CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=51200
@@ -978,7 +977,9 @@ CONFIG_HWMON=y
 #
 # Multimedia devices
 #
-# CONFIG_VIDEO_DEV is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_VIDEO_V4L2=y
 
 #
@@ -1563,3 +1564,4 @@ CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_KTIME_SCALAR=y
+# CONFIG_SHARPSL_RC is not set
-- 
cgit v1.2.3