diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 20:24:44 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 20:24:44 +0100 |
commit | bd1d462e13b278fc57752d0b9b15040e60e561a0 (patch) | |
tree | e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8 /arch/arm/mach-vexpress/hotplug.c | |
parent | sysfs: Update the name hash when renaming sysfs entries (diff) | |
parent | Linux 3.3-rc2 (diff) | |
download | linux-bd1d462e13b278fc57752d0b9b15040e60e561a0.tar.xz linux-bd1d462e13b278fc57752d0b9b15040e60e561a0.zip |
Merge 3.3-rc2 into the driver-core-next branch.
This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-vexpress/hotplug.c')
-rw-r--r-- | arch/arm/mach-vexpress/hotplug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c index 813ee08f96e6..3034a4dab4a1 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@ -13,6 +13,7 @@ #include <linux/smp.h> #include <asm/cacheflush.h> +#include <asm/smp_plat.h> #include <asm/system.h> extern volatile int pen_release; |