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/net/ip_vs.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/net/ip_vs.h')
| -rw-r--r-- | include/net/ip_vs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 7d2674fde19a..3b57b159b653 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -248,7 +248,6 @@ struct ip_vs_daemon_user { | |||
| 248 | 248 | ||
| 249 | #ifdef __KERNEL__ | 249 | #ifdef __KERNEL__ |
| 250 | 250 | ||
| 251 | #include <linux/config.h> | ||
| 252 | #include <linux/list.h> /* for struct list_head */ | 251 | #include <linux/list.h> /* for struct list_head */ |
| 253 | #include <linux/spinlock.h> /* for struct rwlock_t */ | 252 | #include <linux/spinlock.h> /* for struct rwlock_t */ |
| 254 | #include <asm/atomic.h> /* for struct atomic_t */ | 253 | #include <asm/atomic.h> /* for struct atomic_t */ |