[PATCH] Fix include problem. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>

[PATCH] Fix include problem. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>

[Belisko Marek]

Hi,

when make htcherald_defconfig on current linux-omap tree
(82f1d8f22f2c65e70206e40a6f17688bf64a892c) compilation fails
in drivers/video/omap/lcd_htcherald.c.

Following patch fixed this problem.

---
 drivers/video/omap/lcd_htcherald.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/video/omap/lcd_htcherald.c
b/drivers/video/omap/lcd_htcherald.c
index 2e0c81e..a9007c5 100644
--- a/drivers/video/omap/lcd_htcherald.c
+++ b/drivers/video/omap/lcd_htcherald.c
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>

-#include <plat/omapfb.h>
+#include "omapfb.h"

 static int htcherald_panel_init(struct lcd_panel *panel,
 					struct omapfb_device *fbdev)
-- 
1.6.4.2

Re: [PATCH] Fix include problem. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>

[Cory Maccarrone]

On Thu, Dec 3, 2009 at 5:28 AM, Belisko Marek <marek.belisko@gmail.com> wrote:
>
> Hi,
>
> when make htcherald_defconfig on current linux-omap tree
> (82f1d8f22f2c65e70206e40a6f17688bf64a892c) compilation fails
> in drivers/video/omap/lcd_htcherald.c.
>
> Following patch fixed this problem.

Marek and I talked on IRC about this, and it turns out this is true on
the linux-omap master branch, but for-next compiles without issue,
possibly due to the header changes not having been done on the master
branch yet.

- Cory

Re: [PATCH] Fix include problem. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>

[Tony Lindgren]

* Cory Maccarrone <darkstar6262@gmail.com> [091203 07:28]:
> On Thu, Dec 3, 2009 at 5:28 AM, Belisko Marek <marek.belisko@gmail.com> wrote:
> >
> > Hi,
> >
> > when make htcherald_defconfig on current linux-omap tree
> > (82f1d8f22f2c65e70206e40a6f17688bf64a892c) compilation fails
> > in drivers/video/omap/lcd_htcherald.c.
> >
> > Following patch fixed this problem.
> 
> Marek and I talked on IRC about this, and it turns out this is true on
> the linux-omap master branch, but for-next compiles without issue,
> possibly due to the header changes not having been done on the master
> branch yet.

Looks like Tomi's DSS2 moved this around. The DSS2 code is merged
into linux-omap master branch, but is not in omap for-next branch.

I've applied this to linux-omap master branch for now. 

Tomi, can you please add this to your fixes queue?

The patch in question is at:

http://patchwork.kernel.org/patch/64520/

Regards,

Tony

Re: [PATCH] Fix include problem. Signed-off-by: Marek Belisko <marek.belisko@gmail.com>

[Tomi Valkeinen]

On Sat, 2009-12-05 at 00:00 +0100, ext Tony Lindgren wrote:
> * Cory Maccarrone <darkstar6262@gmail.com> [091203 07:28]:
> > On Thu, Dec 3, 2009 at 5:28 AM, Belisko Marek <marek.belisko@gmail.com> wrote:
> > >
> > > Hi,
> > >
> > > when make htcherald_defconfig on current linux-omap tree
> > > (82f1d8f22f2c65e70206e40a6f17688bf64a892c) compilation fails
> > > in drivers/video/omap/lcd_htcherald.c.
> > >
> > > Following patch fixed this problem.
> > 
> > Marek and I talked on IRC about this, and it turns out this is true on
> > the linux-omap master branch, but for-next compiles without issue,
> > possibly due to the header changes not having been done on the master
> > branch yet.
> 
> Looks like Tomi's DSS2 moved this around. The DSS2 code is merged
> into linux-omap master branch, but is not in omap for-next branch.
> 
> I've applied this to linux-omap master branch for now. 
> 
> Tomi, can you please add this to your fixes queue?
> 
> The patch in question is at:
> 
> http://patchwork.kernel.org/patch/64520/

Yes, I'll take it. And I actually anyway need to re-check before sending
pull request that all includes are correct, as there may have been new
LCDs/board files.

 Tomi

[APPLIED] [PATCH] Fix include problem. Signed-off-by: Marek Belisko

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: master

Initial commit ID (Likely to change): 3929b04e6e48d1294376eac04e47bb7cdf6a085d

PatchWorks
http://patchwork.kernel.org/patch/64520/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=3929b04e6e48d1294376eac04e47bb7cdf6a085d