summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-09-19 10:46:56 -0700
committerTony Lindgren <tony@atomide.com>2012-09-20 14:54:57 -0700
commit70c494c3122fb3d53518aea53c8cf5d61cad909a (patch)
tree5f3c174d13ad2e459a73902f0d7162d3473e612c /drivers/pcmcia
parenta619ca9c4a132472adce3b8d11d0fdafa91ae9dd (diff)
downloadlinux-stable-70c494c3122fb3d53518aea53c8cf5d61cad909a.tar.gz
linux-stable-70c494c3122fb3d53518aea53c8cf5d61cad909a.tar.bz2
linux-stable-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/pcmcia')
-rw-r--r--drivers/pcmcia/omap_cf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 0ad06a3bd562..fa74efe82206 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -24,7 +24,7 @@
#include <asm/io.h>
#include <asm/sizes.h>
-#include <plat/mux.h>
+#include <mach/mux.h>
#include <plat/tc.h>