diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /include/asm-mips/asmmacro.h | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
Diffstat (limited to 'include/asm-mips/asmmacro.h')
| -rw-r--r-- | include/asm-mips/asmmacro.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h index f54aa147ec19..2c42f6b00a49 100644 --- a/include/asm-mips/asmmacro.h +++ b/include/asm-mips/asmmacro.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #ifndef _ASM_ASMMACRO_H | 8 | #ifndef _ASM_ASMMACRO_H |
| 9 | #define _ASM_ASMMACRO_H | 9 | #define _ASM_ASMMACRO_H |
| 10 | 10 | ||
| 11 | #include <linux/config.h> | ||
| 12 | #include <asm/hazards.h> | 11 | #include <asm/hazards.h> |
| 13 | 12 | ||
| 14 | #ifdef CONFIG_32BIT | 13 | #ifdef CONFIG_32BIT |