Signed-off-by: Mircea Gherzan mgherzan@gmail.com --- arch/arm/mach-omap2/board-omap4panda.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 084e0a6..77ab174 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -63,10 +63,6 @@ #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */ #define HDMI_GPIO_HPD 63 /* Hotplug detect */
-<<<<<<< current -/* wl127x BT, FM, GPS connectivity chip */ -static int wl1271_gpios[] = {46, -1, -1}; -======= #define FIXED_REG_VWLAN_ID 0 #define FIXED_REG_V2V1_ID 1 #define FIXED_REG_V1V8_ID 2 @@ -74,7 +70,6 @@ static int wl1271_gpios[] = {46, -1, -1}; /* wl127x BT, FM, GPS connectivity chip */ static int wl1271_gpios[] = {46, -1, -1};
->>>>>>> patched static struct platform_device wl1271_device = { .name = "kim", .id = -1,
Signed-off-by: Mircea Gherzan mgherzan@gmail.com --- drivers/media/video/omap/omap_vout.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 0d036b1..fdc1fb1 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -2305,14 +2305,16 @@ static int __init omap_vout_probe(struct platform_device *pdev) if (ret) goto probe_err2;
- if (!cpu_is_omap54xx()) { - for (i = 0; i < vid_dev->num_displays; i++) { - struct omap_dss_device *display = vid_dev->displays[i]; + if (cpu_is_omap54xx()) + return 0; + + for (i = 0; i < vid_dev->num_displays; i++) { + struct omap_dss_device *display = vid_dev->displays[i];
if (display->driver && display->driver->update) display->driver->update(display, 0, 0, - display->panel.timings.x_res, - display->panel.timings.y_res); + display->panel.timings.x_res, + display->panel.timings.y_res); }
return 0;
-
Mircea Gherzan