diff options
| author | merge <null@invalid> | 2009-01-19 01:18:14 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-19 01:18:14 +0000 |
| commit | 0afddaa588f2a43a02b4ed286629b53c1d16ad0b (patch) | |
| tree | 8f980c7a19d6f0f5f08f065c3b8575a1319f768b /drivers/input | |
| parent | d1184dc21448404d2e274ce5a5a95b98878a624f (diff) | |
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 <null@invalid>
MERGE-via-stable-tracking-hist-fix-pcap7200-touchscreen-filte
stable-tracking-hist top was fix-pcap7200-touchscreen-filte / e053b5719609ded159a22bcd1889bbd2611789ba ... parent commitmessage:
From: Andy Green <andy@openmoko.com>
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 <andy@openmoko.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/pcap7200_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 <linux/input.h> #include <linux/pcap7200.h> -#include <linux/ts_filter.h> +#include <../drivers/input/touchscreen/ts_filter.h> #include <mach/om-gta03.h> |