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 /arch/um | |
| 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 'arch/um')
| -rw-r--r-- | arch/um/drivers/net_kern.c | 1 | ||||
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 1495007bf6c0..721e2601a75d 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include "linux/ctype.h" | 20 | #include "linux/ctype.h" |
| 21 | #include "linux/bootmem.h" | 21 | #include "linux/bootmem.h" |
| 22 | #include "linux/ethtool.h" | 22 | #include "linux/ethtool.h" |
| 23 | #include "linux/platform_device.h" | ||
| 23 | #include "asm/uaccess.h" | 24 | #include "asm/uaccess.h" |
| 24 | #include "user_util.h" | 25 | #include "user_util.h" |
| 25 | #include "kern_util.h" | 26 | #include "kern_util.h" |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index f73134333f64..b2c86257b0f8 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include "linux/blkpg.h" | 35 | #include "linux/blkpg.h" |
| 36 | #include "linux/genhd.h" | 36 | #include "linux/genhd.h" |
| 37 | #include "linux/spinlock.h" | 37 | #include "linux/spinlock.h" |
| 38 | #include "linux/platform_device.h" | ||
| 38 | #include "asm/segment.h" | 39 | #include "asm/segment.h" |
| 39 | #include "asm/uaccess.h" | 40 | #include "asm/uaccess.h" |
| 40 | #include "asm/irq.h" | 41 | #include "asm/irq.h" |