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-ppc/amigahw.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-ppc/amigahw.h')
| -rw-r--r-- | include/asm-ppc/amigahw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc/amigahw.h b/include/asm-ppc/amigahw.h index 8c98945e7dc1..90fd1274d727 100644 --- a/include/asm-ppc/amigahw.h +++ b/include/asm-ppc/amigahw.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #ifndef __ASMPPC_AMIGAHW_H | 2 | #ifndef __ASMPPC_AMIGAHW_H |
| 3 | #define __ASMPPC_AMIGAHW_H | 3 | #define __ASMPPC_AMIGAHW_H |
| 4 | 4 | ||
| 5 | #include <linux/config.h> | ||
| 6 | #include <asm-m68k/amigahw.h> | 5 | #include <asm-m68k/amigahw.h> |
| 7 | 6 | ||
| 8 | #undef CHIP_PHYSADDR | 7 | #undef CHIP_PHYSADDR |