diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /drivers/usb/input/usbtouchscreen.c | |
parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.gz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'drivers/usb/input/usbtouchscreen.c')
-rw-r--r-- | drivers/usb/input/usbtouchscreen.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c index 4640d1000d83c..923e22db18d4f 100644 --- a/drivers/usb/input/usbtouchscreen.c +++ b/drivers/usb/input/usbtouchscreen.c @@ -35,7 +35,6 @@ //#define DEBUG -#include <linux/config.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/input.h> |