diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-09 14:32:44 -0700 |
commit | 65c98038394e65228490ef44353f5d4665690f55 (patch) | |
tree | c7bd5afb40d455d995ec65bd9a6fb5d456e0bd45 /arch/arm/mach-omap1/mux.c | |
parent | bfd17879866b36e95c58721da070d9f2ac7f8901 (diff) | |
parent | b2f44dc29bfab77b10f3a709f14677f51ce3a4cd (diff) |
Merge branch 'fixes-non-critical' into cleanup-devices
Diffstat (limited to 'arch/arm/mach-omap1/mux.c')
-rw-r--r-- | arch/arm/mach-omap1/mux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 087dba0df47e..e9cc52d4cb28 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/spinlock.h> +#include <mach/hardware.h> #include <plat/mux.h> |