diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:54:37 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:54:37 -0500 |
| commit | e532c37858fdcc18e9a91d24c2e22cd21aa22561 (patch) | |
| tree | d2d27707914fa6690774be7051ac98e6fce4e755 /drivers/usb/media | |
| parent | 87199134b4a85de56a7508c551ab3b3a3ee35035 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/media')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 1 | ||||
| -rw-r--r-- | drivers/usb/media/pwc/pwc.h | 2 | ||||
| -rw-r--r-- | drivers/usb/media/w9968cf.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index b77e65c03659..5524fd70210b 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c @@ -62,6 +62,7 @@ #include <linux/poll.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/version.h> #include <asm/io.h> #include "pwc.h" diff --git a/drivers/usb/media/pwc/pwc.h b/drivers/usb/media/pwc/pwc.h index 267869dab185..6dd76bb3dff1 100644 --- a/drivers/usb/media/pwc/pwc.h +++ b/drivers/usb/media/pwc/pwc.h @@ -25,8 +25,6 @@ #ifndef PWC_H #define PWC_H -#include <linux/version.h> - #include <linux/config.h> #include <linux/module.h> #include <linux/usb.h> diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c index f36c0b6c6e36..67612c81cb9f 100644 --- a/drivers/usb/media/w9968cf.c +++ b/drivers/usb/media/w9968cf.c @@ -25,7 +25,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ***************************************************************************/ -#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/kmod.h> |