diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-18 03:12:36 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-18 03:12:36 +0400 |
| commit | 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch) | |
| tree | 72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/arm/mach-ux500/board-u5500.c | |
| parent | 40c0591f0a349ec074357e05c6ab1a3bc951807c (diff) | |
| parent | 19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff) | |
| download | linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.tar.xz | |
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/mach-ux500/board-u5500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index fe1569b67c91..9de9e9c4dbbb 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -10,7 +10,7 @@ #include <linux/amba/bus.h> #include <linux/irq.h> #include <linux/i2c.h> -#include <linux/mfd/ab5500/ab5500.h> +#include <linux/mfd/abx500/ab5500.h> #include <asm/hardware/gic.h> #include <asm/mach/arch.h> |