diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/alpha/include/asm/local.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
| download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/alpha/include/asm/local.h')
| -rw-r--r-- | arch/alpha/include/asm/local.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/local.h b/arch/alpha/include/asm/local.h index b9e3e3318371..9c94b8456043 100644 --- a/arch/alpha/include/asm/local.h +++ b/arch/alpha/include/asm/local.h @@ -2,7 +2,7 @@ #define _ALPHA_LOCAL_H #include <linux/percpu.h> -#include <asm/atomic.h> +#include <linux/atomic.h> typedef struct { |