diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /drivers/net/ipg.h | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/net/ipg.h')
| -rw-r--r-- | drivers/net/ipg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index e0e718ab4c2e..dd9318f19497 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #ifndef __LINUX_IPG_H | 7 | #ifndef __LINUX_IPG_H |
| 8 | #define __LINUX_IPG_H | 8 | #define __LINUX_IPG_H |
| 9 | 9 | ||
| 10 | #include <linux/version.h> | ||
| 11 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 12 | 11 | ||
| 13 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| @@ -21,7 +20,6 @@ | |||
| 21 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
| 24 | #include <linux/version.h> | ||
| 25 | #include <asm/bitops.h> | 23 | #include <asm/bitops.h> |
| 26 | 24 | ||
| 27 | /* | 25 | /* |