diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-sparc/asmmacro.h | |
| parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
| parent | Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff) | |
| download | linux-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz linux-70ac4385a13f78bc478f26d317511893741b05bd.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-sparc/asmmacro.h')
| -rw-r--r-- | include/asm-sparc/asmmacro.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/asmmacro.h b/include/asm-sparc/asmmacro.h index 0d4b65bd252b..a619a4d97aae 100644 --- a/include/asm-sparc/asmmacro.h +++ b/include/asm-sparc/asmmacro.h @@ -6,7 +6,6 @@ #ifndef _SPARC_ASMMACRO_H #define _SPARC_ASMMACRO_H -#include <linux/config.h> #include <asm/btfixup.h> #include <asm/asi.h> |