diff options
| author |   Tony Lindgren <tony@atomide.com> | 2012-09-19 10:46:56 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-20 14:54:57 -0700 |
| commit | 70c494c3122fb3d53518aea53c8cf5d61cad909a (patch) | |
| tree | 5f3c174d13ad2e459a73902f0d7162d3473e612c /drivers/video | |
| parent | ARM: OMAP: Remove smp.h (diff) | |
| download | linux-dev-70c494c3122fb3d53518aea53c8cf5d61cad909a.tar.xz linux-dev-70c494c3122fb3d53518aea53c8cf5d61cad909a.zip | |
ARM: OMAP1: Make plat/mux.h omap1 only
We are moving omap2+ to use the device tree based pinctrl-single.c
and will be removing the old mux framework. This will remove the
omap1 specific parts from plat-omap.
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-usb@vger.kernel.org
Cc: linux-pcmcia@lists.infradead.org
Cc: spi-devel-general@lists.sourceforge.net
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/backlight/omap1_bl.c | 2 | ||||
| -rw-r--r-- | drivers/video/omap/lcd_osk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c index 92257ef19403..9a046a4c98f5 100644 --- a/drivers/video/backlight/omap1_bl.c +++ b/drivers/video/backlight/omap1_bl.c @@ -30,7 +30,7 @@ #include <linux/platform_data/omap1_bl.h> #include <mach/hardware.h> -#include <plat/mux.h> +#include <mach/mux.h> #define OMAPBL_MAX_INTENSITY 0xff diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c index 5914220dfa9c..3aa62da89195 100644 --- a/drivers/video/omap/lcd_osk.c +++ b/drivers/video/omap/lcd_osk.c @@ -24,7 +24,7 @@ #include <linux/platform_device.h> #include <asm/gpio.h> -#include <plat/mux.h> +#include <mach/mux.h> #include "omapfb.h" static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev) |