diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /arch/um | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
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 1495007bf6..721e2601a7 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 f73134333f..b2c86257b0 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" |