summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/linux/linux-omap/omap3evm/defconfig4
-rw-r--r--packages/linux/linux-omap_git.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index 427daa6eed..78fb68ba2d 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -1376,9 +1376,9 @@ CONFIG_FB_OMAP2_NUM_FBS=3
# OMAP2/3 Display Device Drivers
#
CONFIG_PANEL_DVI=y
-# CONFIG_PANEL_DVI_640X480 is not set
+CONFIG_PANEL_DVI_640X480=y
# CONFIG_PANEL_DVI_800X600 is not set
-CONFIG_PANEL_DVI_1024X768=y
+#CONFIG_PANEL_DVI_1024X768=n
# CONFIG_PANEL_DVI_1280X1024 is not set
CONFIG_PANEL_SHARP_LS037V7DW01=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index abff75e967..5dad7ca048 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -14,7 +14,7 @@ SRCREV = "9d211b761b3cdf7736602ecf7e68f8a298c13278"
PV = "2.6.27+2.6.28-rc8+${PR}+gitr${SRCREV}"
#PV = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;branch=pm;protocol=git \
file://defconfig"