aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-08 09:34:17 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-08 09:34:17 +0000
commitf308f9500d80374cf504a66be8ef02a1699a26d4 (patch)
tree3d085f031e9915ecae78117a6043c7151521706e
parentb77cd2b93d4e546197001db5c8fed21dd827f416 (diff)
downloadopenembedded-f308f9500d80374cf504a66be8ef02a1699a26d4.tar.gz
linux-neuros: bump SRCREV and update defconfig
-rw-r--r--packages/linux/linux-neuros/neuros-osd2/defconfig4
-rw-r--r--packages/linux/linux-neuros_git.bb4
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig
index b729767e3e..d68f2d069f 100644
--- a/packages/linux/linux-neuros/neuros-osd2/defconfig
+++ b/packages/linux/linux-neuros/neuros-osd2/defconfig
@@ -848,6 +848,8 @@ CONFIG_VIDEO_V4L2=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_DAVINCI=y
+CONFIG_VIDEO_TVP5150=y
# CONFIG_VIDEO_TVP5146 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
@@ -1167,7 +1169,7 @@ CONFIG_INOTIFY_USER=y
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m
-# CONFIG_FUSE_FS is not set
+CONFIG_FUSE_FS=y
#
# CD-ROM/DVD Filesystems
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index db04361de6..5450fe75f8 100644
--- a/packages/linux/linux-neuros_git.bb
+++ b/packages/linux/linux-neuros_git.bb
@@ -2,10 +2,10 @@ require linux.inc
DESCRIPTION = "Linux kernel for Neuros OSD devices"
-SRCREV = "730beeee197cef4ff1e92ee322481380996a0390"
+SRCREV = "723849a80153f079a653d06a660f63fec67f6d1e"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r3"
+PR = "r4"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"