diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
| commit | 698cb5d58f5498273e71d4797c8b3353535c8de6 (patch) | |
| tree | 20f459c3e673a04c82ba2d529fc14efd28c1dcb5 /arch/arm/mach-spear3xx/spear3xx.c | |
| parent | 97c64b5e2132e104a8c25026319b239fce7463f4 (diff) | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
Merge remote-tracking branch 'linus/master' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130408.0
Update to 3.9-rc6
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/hid/hid-magicmouse.c
Diffstat (limited to 'arch/arm/mach-spear3xx/spear3xx.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index f9d754f90c59..d2b3937c4014 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -14,7 +14,7 @@ #define pr_fmt(fmt) "SPEAr3xx: " fmt #include <linux/amba/pl022.h> -#include <linux/amba/pl08x.h> +#include <linux/amba/pl080.h> #include <linux/io.h> #include <plat/pl080.h> #include <mach/generic.h> |