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/ncp_fs.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/ncp_fs.h')
| -rw-r--r-- | include/linux/ncp_fs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h index 96dc237b8f03..b208f0cd556b 100644 --- a/include/linux/ncp_fs.h +++ b/include/linux/ncp_fs.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #include <linux/in.h> | 12 | #include <linux/in.h> |
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | 14 | ||
| 15 | #include <linux/ncp_fs_i.h> | ||
| 16 | #include <linux/ncp_fs_sb.h> | ||
| 17 | #include <linux/ipx.h> | 15 | #include <linux/ipx.h> |
| 18 | #include <linux/ncp_no.h> | 16 | #include <linux/ncp_no.h> |
| 19 | 17 | ||
| @@ -146,7 +144,8 @@ struct ncp_nls_ioctl | |||
| 146 | 144 | ||
| 147 | #ifdef __KERNEL__ | 145 | #ifdef __KERNEL__ |
| 148 | 146 | ||
| 149 | #include <linux/config.h> | 147 | #include <linux/ncp_fs_i.h> |
| 148 | #include <linux/ncp_fs_sb.h> | ||
| 150 | 149 | ||
| 151 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ | 150 | /* undef because public define in umsdos_fs.h (ncp_fs.h isn't public) */ |
| 152 | #undef PRINTK | 151 | #undef PRINTK |