diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-04 17:22:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-04-04 17:22:05 -0800 |
| commit | 4c7f178f0cf3649bb7dd12f6ed2cb373aec80a77 (patch) | |
| tree | 790ccf4d04469d135ed342faec16dbf7ea894127 | |
| parent | 901e03ef496173ea253c09db0500c63143adcb4b (diff) | |
| parent | debff6a9d68a799e4255cf82d0982e59d3d996cd (diff) | |
Merge master.kernel.org:/home/davem/BK/misc-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
| -rw-r--r-- | drivers/media/video/videodev.c | 1 | ||||
| -rw-r--r-- | drivers/usb/hub.c | 1 | ||||
| -rw-r--r-- | kernel/time.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 834d86e45f49..1357c418d2a7 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -27,6 +27,7 @@ #include <linux/errno.h> #include <linux/init.h> #include <linux/kmod.h> +#include <linux/slab.h> #include <asm/uaccess.h> #include <asm/system.h> #include <asm/semaphore.h> diff --git a/drivers/usb/hub.c b/drivers/usb/hub.c index f598a3cc98e0..29c45f74bf6f 100644 --- a/drivers/usb/hub.c +++ b/drivers/usb/hub.c @@ -10,6 +10,7 @@ #include <linux/config.h> #include <linux/kernel.h> +#include <linux/errno.h> #include <linux/module.h> #include <linux/completion.h> #include <linux/sched.h> diff --git a/kernel/time.c b/kernel/time.c index 8c5450db79ed..e1a141a78b9f 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -25,6 +25,7 @@ */ #include <linux/timex.h> +#include <linux/errno.h> #include <linux/smp_lock.h> #include <asm/uaccess.h> |