diff options
author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
---|---|---|
committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
commit | 8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch) | |
tree | 67349c6a69740150b67c4c39de49cde9b3648aa5 /arch/arm/mach-shmobile/smp-r8a7779.c | |
parent | 94f61a7666224ab307e387ff0d146055ae77e6ab (diff) | |
parent | e29206381a1436e0f47c0f5b9a23159a03c57715 (diff) | |
download | talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip |
Merge branch 'fbdev-for-linus' into fbdev-next
Diffstat (limited to 'arch/arm/mach-shmobile/smp-r8a7779.c')
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7779.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c index cc97ef892d1b..4fe2e9eaf501 100644 --- a/arch/arm/mach-shmobile/smp-r8a7779.c +++ b/arch/arm/mach-shmobile/smp-r8a7779.c @@ -25,6 +25,7 @@ #include <linux/delay.h> #include <mach/common.h> #include <mach/r8a7779.h> +#include <asm/smp_plat.h> #include <asm/smp_scu.h> #include <asm/smp_twd.h> #include <asm/hardware/gic.h> |