aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/mux.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-11-10 18:10:34 -0800
committerTony Lindgren <tony@atomide.com>2009-11-10 18:10:34 -0800
commit774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch)
treea9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/plat-omap/mux.c
parentb419148e567728f6af0c3b01965c1cc141e3e13a (diff)
parentce491cf85466c3377228c5a852ea627ec5136956 (diff)
downloadkernel_samsung_crespo-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip
kernel_samsung_crespo-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.gz
kernel_samsung_crespo-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.bz2
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/plat-omap/mux.c')
-rw-r--r--arch/arm/plat-omap/mux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 8d329fb..05aebca 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -28,7 +28,7 @@
#include <linux/io.h>
#include <asm/system.h>
#include <linux/spinlock.h>
-#include <mach/mux.h>
+#include <plat/mux.h>
#ifdef CONFIG_OMAP_MUX