diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-27 19:17:07 -0700 |
| commit | b30a72a7edfc64c8929104d5c2178aca489aa559 (patch) | |
| tree | 2b26c155c318d08d946bd2d70cf815dcdb29a243 /drivers/input/touchscreen/wm9713.c | |
| parent | f1c5d30e1d79bbfb60eaf189db862d3cb2bcac92 (diff) | |
| parent | c1b362e3b4d331a63915b268a33207311a439d60 (diff) | |
| download | op-kernel-dev-b30a72a7edfc64c8929104d5c2178aca489aa559.zip op-kernel-dev-b30a72a7edfc64c8929104d5c2178aca489aa559.tar.gz | |
Merge branch 'x86/urgent' into x86/cpu
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Diffstat (limited to 'drivers/input/touchscreen/wm9713.c')
| -rw-r--r-- | drivers/input/touchscreen/wm9713.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/wm9713.c b/drivers/input/touchscreen/wm9713.c index 8384587..781ee83 100644 --- a/drivers/input/touchscreen/wm9713.c +++ b/drivers/input/touchscreen/wm9713.c @@ -17,7 +17,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/version.h> #include <linux/kernel.h> #include <linux/input.h> #include <linux/delay.h> |
