diff options
| author | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
| commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
| tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /arch/arm/plat-omap/mux.c | |
| parent | 08e3daff217059c84c360cc71212686e0a7995af (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/plat-omap/mux.c')
| -rw-r--r-- | arch/arm/plat-omap/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c index 8d329fb2074..05aebcad215 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 |