diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
| commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
| tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /arch/arm/mach-omap1/i2c.c | |
| parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
| parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'arch/arm/mach-omap1/i2c.c')
| -rw-r--r-- | arch/arm/mach-omap1/i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 5446c991264..a0551a6d745 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -20,7 +20,7 @@ */ #include <plat/i2c.h> -#include <plat/mux.h> +#include <mach/mux.h> #include <plat/cpu.h> void __init omap1_i2c_mux_pins(int bus_id) |