diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-30 18:38:48 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-30 18:38:48 +0000 |
| commit | cca8232cceedb002d25514df8db2953e3598a9cf (patch) | |
| tree | b599406a97298858dd8c9ae11ce78d9268b0139b /packages/linux | |
| parent | 090b0af980c6f5e66e3127ceb4c41fec869beda6 (diff) | |
| parent | 8aa18f979e3ae6014e8303fcd2196e22e8f713df (diff) | |
merge of '1d6f127aae1dbce4a91a9955218de3c4f5ea5f7b'
and '9a389e1e5a5eaac66e8c921c1d1196c323a5030c'
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/linux-neuros/neuros-osd2/defconfig | 11 | ||||
| -rw-r--r-- | packages/linux/linux-neuros_git.bb | 4 |
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)" |