From 0afddaa588f2a43a02b4ed286629b53c1d16ad0b Mon Sep 17 00:00:00 2001 From: merge Date: Mon, 19 Jan 2009 01:18:14 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-fix-pcap7200-touchscreen-filte-1232327393 pending-tracking-hist top was MERGE-via-stable-tracking-fix-pcap7200-touchscreen-filte-1232327393 / 751df35b8e57667cc0669a7437f80b6c025f24ec ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-fix-pcap7200-touchscreen-filte stable-tracking-hist top was fix-pcap7200-touchscreen-filte / e053b5719609ded159a22bcd1889bbd2611789ba ... parent commitmessage: From: Andy Green fix-pcap7200-touchscreen-filter-move.patch pcap7200 driver also uses our filter chain stuff now, so it needed a little fixup when the includes moved for upstream Signed-off-by: Andy Green --- drivers/input/touchscreen/pcap7200_ts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input/touchscreen/pcap7200_ts.c') diff --git a/drivers/input/touchscreen/pcap7200_ts.c b/drivers/input/touchscreen/pcap7200_ts.c index 4ee1c60398e..730ee32138e 100644 --- a/drivers/input/touchscreen/pcap7200_ts.c +++ b/drivers/input/touchscreen/pcap7200_ts.c @@ -26,7 +26,7 @@ #include #include -#include +#include <../drivers/input/touchscreen/ts_filter.h> #include -- cgit v1.2.3