diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-09 19:06:04 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-09 19:06:04 -0500 |
commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /drivers/net/mv643xx_eth.h | |
parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/mv643xx_eth.h')
-rw-r--r-- | drivers/net/mv643xx_eth.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h index bcfda5192da0..f769f9b626ea 100644 --- a/drivers/net/mv643xx_eth.h +++ b/drivers/net/mv643xx_eth.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef __MV643XX_ETH_H__ | 1 | #ifndef __MV643XX_ETH_H__ |
2 | #define __MV643XX_ETH_H__ | 2 | #define __MV643XX_ETH_H__ |
3 | 3 | ||
4 | #include <linux/version.h> | ||
5 | #include <linux/module.h> | 4 | #include <linux/module.h> |
6 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
7 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |