diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /include/asm-mips/apm.h | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'include/asm-mips/apm.h')
| -rw-r--r-- | include/asm-mips/apm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/apm.h b/include/asm-mips/apm.h index e8c69208f63a..4b99ffc11529 100644 --- a/include/asm-mips/apm.h +++ b/include/asm-mips/apm.h | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #ifndef MIPS_ASM_SA1100_APM_H | 13 | #ifndef MIPS_ASM_SA1100_APM_H |
| 14 | #define MIPS_ASM_SA1100_APM_H | 14 | #define MIPS_ASM_SA1100_APM_H |
| 15 | 15 | ||
| 16 | #include <linux/config.h> | ||
| 17 | #include <linux/apm_bios.h> | 16 | #include <linux/apm_bios.h> |
| 18 | 17 | ||
| 19 | /* | 18 | /* |