summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-30 17:30:12 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-30 17:30:12 +0000
commit176405c701cffad521df8c00845450f253281732 (patch)
treedb633d45e19479458c94e95f521ac16b8ec8841c
parent4c9621ec61a8dbfb4fc5b8337fd7cf78e4feee8e (diff)
linux-neuros: bump SRCREV
-rw-r--r--packages/linux/linux-neuros/neuros-osd2/defconfig11
-rw-r--r--packages/linux/linux-neuros_git.bb4
2 files changed, 8 insertions, 7 deletions
diff --git a/packages/linux/linux-neuros/neuros-osd2/defconfig b/packages/linux/linux-neuros/neuros-osd2/defconfig
index d68f2d069f..1958f1ca0c 100644
--- a/packages/linux/linux-neuros/neuros-osd2/defconfig
+++ b/packages/linux/linux-neuros/neuros-osd2/defconfig
@@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -496,7 +496,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
+CONFIG_IDE_MAX_HWIFS=1
CONFIG_BLK_DEV_IDE=y
#
@@ -850,6 +850,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_DAVINCI=y
CONFIG_VIDEO_TVP5150=y
+CONFIG_VIDEO_TVP7000=y
# CONFIG_VIDEO_TVP5146 is not set
# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
@@ -892,7 +893,7 @@ CONFIG_DAB=y
#
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
# CONFIG_FB_DDC is not set
@@ -914,9 +915,9 @@ CONFIG_FB_DEFERRED_IO=y
# Frame buffer hardware drivers
#
# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_DAVINCI=y
+# CONFIG_FB_DAVINCI is not set
# CONFIG_FB_VIRTUAL is not set
-
+CONFIG_FB_DM=y
#
# Console display driver support
#
diff --git a/packages/linux/linux-neuros_git.bb b/packages/linux/linux-neuros_git.bb
index 345e3174ae..563a2c5aaa 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 = "7ee93e596406d465e5af2c119e13def9af323f6b"
+SRCREV = "d2867be8abb7d67442cec3ae13d782f1254835d8"
PV = "2.6.23-${PR}+git${SRCREV}"
-PR = "r8"
+PR = "r9"
COMPATIBLE_MACHINE = "(neuros-osd|neuros-osd2)"