diff options
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 2 | ||||
| -rw-r--r-- | include/video/omap-panel-nokia-dsi.h (renamed from arch/arm/plat-omap/include/plat/nokia-dsi-panel.h) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 4673517cee71..ed46a1e99c47 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -34,7 +34,7 @@ #include <linux/mutex.h> #include <video/omapdss.h> -#include <plat/nokia-dsi-panel.h> +#include <video/omap-panel-nokia-dsi.h> /* DSI Virtual channel. Hardcoded for now. */ #define TCH 0 diff --git a/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h b/include/video/omap-panel-nokia-dsi.h index 4d1e794cf465..e109b21e975a 100644 --- a/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h +++ b/include/video/omap-panel-nokia-dsi.h @@ -1,5 +1,5 @@ -#ifndef __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H -#define __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H +#ifndef __OMAP_NOKIA_DSI_PANEL_H +#define __OMAP_NOKIA_DSI_PANEL_H struct omap_dss_device; @@ -28,4 +28,4 @@ struct nokia_dsi_panel_data { int (*get_backlight)(struct omap_dss_device *dssdev); }; -#endif /* __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H */ +#endif /* __OMAP_NOKIA_DSI_PANEL_H */ |