diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 18:30:45 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 18:30:45 (GMT) |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /arch/arm/mach-vexpress/hotplug.c | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
| download | linux-fsl-qoriq-06eb4eafbdc0796d741d139a44f1253278da8611.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-vexpress/hotplug.c')
| -rw-r--r-- | arch/arm/mach-vexpress/hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c index 3034a4d..c504a72 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@ -14,7 +14,7 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> -#include <asm/system.h> +#include <asm/cp15.h> extern volatile int pen_release; |