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/linux/coda.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/linux/coda.h')
| -rw-r--r-- | include/linux/coda.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/coda.h b/include/linux/coda.h index bbc5afcd7db6..b5cf0780c51a 100644 --- a/include/linux/coda.h +++ b/include/linux/coda.h | |||
| @@ -59,7 +59,6 @@ Mellon the rights to redistribute these changes without encumbrance. | |||
| 59 | #ifndef _CODA_HEADER_ | 59 | #ifndef _CODA_HEADER_ |
| 60 | #define _CODA_HEADER_ | 60 | #define _CODA_HEADER_ |
| 61 | 61 | ||
| 62 | #include <linux/config.h> | ||
| 63 | 62 | ||
| 64 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ | 63 | /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */ |
| 65 | #if defined(__NetBSD__) || \ | 64 | #if defined(__NetBSD__) || \ |