diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-25 11:57:32 -0400 |
| commit | bbe5d235ee201705530a7153b57e141cd77d818b (patch) | |
| tree | e98c31b4cb2ced6357a87a02596f9ecdbd6dbb26 /include/linux/coda.h | |
| parent | 189acaaef81b1d71aedd0d28810de24160c2e781 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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__) || \ |