diff options
| author | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /kernel/stop_machine.c | |
| parent | arm/dt: tegra devicetree support (diff) | |
| parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
| download | kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.gz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index c1124752e1d3..ba5070ce5765 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -19,7 +19,7 @@ #include <linux/interrupt.h> #include <linux/kallsyms.h> -#include <asm/atomic.h> +#include <linux/atomic.h> /* * Structure to determine completion condition and record errors. May |