From 2f6c87be0ff1dd69d5b443f6b0b964f4e3a9baa8 Mon Sep 17 00:00:00 2001 From: Igor Grinberg Date: Wed, 29 Aug 2012 02:18:55 +0300 Subject: [PATCH] --- yaml --- r: 326500 b: refs/heads/master c: ad6c9101c7949fd7c6a567e3faae94aaa044cd17 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/board-ams-delta.c | 1 - trunk/arch/arm/mach-omap1/board-fsample.c | 1 - trunk/arch/arm/mach-omap1/board-htcherald.c | 1 - trunk/arch/arm/mach-omap1/board-nokia770.c | 1 - trunk/arch/arm/mach-omap1/board-palmte.c | 1 - trunk/arch/arm/mach-omap1/board-palmtt.c | 1 - trunk/arch/arm/mach-omap1/board-palmz71.c | 1 - trunk/arch/arm/mach-omap1/board-perseus2.c | 1 - trunk/arch/arm/mach-omap1/board-sx1.c | 1 - trunk/arch/arm/plat-omap/fb.c | 2 -- trunk/arch/arm/plat-omap/include/plat/board.h | 7 ------- trunk/include/linux/omapfb.h | 7 ++++++- 13 files changed, 7 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index fefdce70011b..0e90c73ef95e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc01272986862b49024b6663559bb89df00f9f1a +refs/heads/master: ad6c9101c7949fd7c6a567e3faae94aaa044cd17 diff --git a/trunk/arch/arm/mach-omap1/board-ams-delta.c b/trunk/arch/arm/mach-omap1/board-ams-delta.c index c53469802c03..c162369e9f77 100644 --- a/trunk/arch/arm/mach-omap1/board-ams-delta.c +++ b/trunk/arch/arm/mach-omap1/board-ams-delta.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-fsample.c b/trunk/arch/arm/mach-omap1/board-fsample.c index 6872f3fd400f..6d985521a39e 100644 --- a/trunk/arch/arm/mach-omap1/board-fsample.c +++ b/trunk/arch/arm/mach-omap1/board-fsample.c @@ -32,7 +32,6 @@ #include #include #include -#include #include diff --git a/trunk/arch/arm/mach-omap1/board-htcherald.c b/trunk/arch/arm/mach-omap1/board-htcherald.c index b3f6e943e661..b9771b5a5f7b 100644 --- a/trunk/arch/arm/mach-omap1/board-htcherald.c +++ b/trunk/arch/arm/mach-omap1/board-htcherald.c @@ -42,7 +42,6 @@ #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-nokia770.c b/trunk/arch/arm/mach-omap1/board-nokia770.c index 2c0ca8fc3380..ec01f03d0446 100644 --- a/trunk/arch/arm/mach-omap1/board-nokia770.c +++ b/trunk/arch/arm/mach-omap1/board-nokia770.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmte.c b/trunk/arch/arm/mach-omap1/board-palmte.c index 7bf00ba51bd6..49f8d745ea1f 100644 --- a/trunk/arch/arm/mach-omap1/board-palmte.c +++ b/trunk/arch/arm/mach-omap1/board-palmte.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmtt.c b/trunk/arch/arm/mach-omap1/board-palmtt.c index 2cce505dd8f6..01523cd78e58 100644 --- a/trunk/arch/arm/mach-omap1/board-palmtt.c +++ b/trunk/arch/arm/mach-omap1/board-palmtt.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmz71.c b/trunk/arch/arm/mach-omap1/board-palmz71.c index 45ab9f03fb85..a7abce69043a 100644 --- a/trunk/arch/arm/mach-omap1/board-palmz71.c +++ b/trunk/arch/arm/mach-omap1/board-palmz71.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-perseus2.c b/trunk/arch/arm/mach-omap1/board-perseus2.c index 703d55ecffe2..277e0bc60a43 100644 --- a/trunk/arch/arm/mach-omap1/board-perseus2.c +++ b/trunk/arch/arm/mach-omap1/board-perseus2.c @@ -32,7 +32,6 @@ #include #include #include -#include #include diff --git a/trunk/arch/arm/mach-omap1/board-sx1.c b/trunk/arch/arm/mach-omap1/board-sx1.c index 8c665bd16ac2..2e1fff26a2f3 100644 --- a/trunk/arch/arm/mach-omap1/board-sx1.c +++ b/trunk/arch/arm/mach-omap1/board-sx1.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include diff --git a/trunk/arch/arm/plat-omap/fb.c b/trunk/arch/arm/plat-omap/fb.c index dd6f92c99e56..bcbb9d5dc293 100644 --- a/trunk/arch/arm/plat-omap/fb.c +++ b/trunk/arch/arm/plat-omap/fb.c @@ -33,8 +33,6 @@ #include #include -#include - #if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE) static bool omapfb_lcd_configured; diff --git a/trunk/arch/arm/plat-omap/include/plat/board.h b/trunk/arch/arm/plat-omap/include/plat/board.h index d0bc46e235bc..2ddc198b0920 100644 --- a/trunk/arch/arm/plat-omap/include/plat/board.h +++ b/trunk/arch/arm/plat-omap/include/plat/board.h @@ -12,13 +12,6 @@ #include -struct omap_lcd_config { - char panel_name[16]; - char ctrl_name[16]; - s16 nreset_gpio; - u8 data_lines; -}; - /* for TI reference platforms sharing the same debug card */ extern int debug_card_init(u32 addr, unsigned gpio); diff --git a/trunk/include/linux/omapfb.h b/trunk/include/linux/omapfb.h index 4ff57e81051d..85af8184691a 100644 --- a/trunk/include/linux/omapfb.h +++ b/trunk/include/linux/omapfb.h @@ -220,7 +220,12 @@ struct omapfb_display_info { #ifdef __KERNEL__ -#include +struct omap_lcd_config { + char panel_name[16]; + char ctrl_name[16]; + s16 nreset_gpio; + u8 data_lines; +}; struct omapfb_platform_data { struct omap_lcd_config lcd;