diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/net/depca.c | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/net/depca.c')
| -rw-r--r-- | drivers/net/depca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index c4aa5fe2840e..4d26e5e7d18b 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
| @@ -254,7 +254,7 @@ | |||
| 254 | #include <linux/unistd.h> | 254 | #include <linux/unistd.h> |
| 255 | #include <linux/ctype.h> | 255 | #include <linux/ctype.h> |
| 256 | #include <linux/moduleparam.h> | 256 | #include <linux/moduleparam.h> |
| 257 | #include <linux/device.h> | 257 | #include <linux/platform_device.h> |
| 258 | #include <linux/bitops.h> | 258 | #include <linux/bitops.h> |
| 259 | 259 | ||
| 260 | #include <asm/uaccess.h> | 260 | #include <asm/uaccess.h> |