diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-mips/mach-db1x00/db1x00.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-mips/mach-db1x00/db1x00.h')
| -rw-r--r-- | include/asm-mips/mach-db1x00/db1x00.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h index 7b28b23f91ce..8fbb4b42a8b5 100644 --- a/include/asm-mips/mach-db1x00/db1x00.h +++ b/include/asm-mips/mach-db1x00/db1x00.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #ifndef __ASM_DB1X00_H | 28 | #ifndef __ASM_DB1X00_H |
| 29 | #define __ASM_DB1X00_H | 29 | #define __ASM_DB1X00_H |
| 30 | 30 | ||
| 31 | #include <linux/config.h> | ||
| 32 | 31 | ||
| 33 | #ifdef CONFIG_MIPS_DB1550 | 32 | #ifdef CONFIG_MIPS_DB1550 |
| 34 | #define BCSR_KSEG1_ADDR 0xAF000000 | 33 | #define BCSR_KSEG1_ADDR 0xAF000000 |