diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:32:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:33:55 +0200 |
| commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
| tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /include/linux/buffer_head.h | |
| parent | f629299b544b6cc12b4e3e85fec96f4ce5809482 (diff) | |
| parent | 140d0b2108faebc77c6523296e211e509cb9f5f9 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 503c8a6b3079..458f497738a4 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -12,7 +12,7 @@ #include <linux/linkage.h> #include <linux/pagemap.h> #include <linux/wait.h> -#include <asm/atomic.h> +#include <linux/atomic.h> #ifdef CONFIG_BLOCK |