From 4f0d7f43b8a9d35be25f520834bbb13f2dae10f3 Mon Sep 17 00:00:00 2001 From: merge Date: Mon, 29 Dec 2008 12:11:49 +0000 Subject: MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci- pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage: From: Balaji Rao This patch gets the Linux mci stack to use the voltage it negotiated before with the uSD card on resume. Without this, it always reverts to and stays at 3.3V. Signed-off-by: Balaji Rao --- drivers/input/touchscreen/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/input/touchscreen/Makefile') diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 9a6162cecc5..b12b0475c9f 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -34,5 +34,7 @@ obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o obj-$(CONFIG_TOUCHSCREEN_FILTER) += ts_filter.o obj-$(CONFIG_TOUCHSCREEN_FILTER_GROUP) += ts_filter_group.o +obj-$(CONFIG_TOUCHSCREEN_FILTER_LINEAR) += ts_filter_linear.o obj-$(CONFIG_TOUCHSCREEN_FILTER_MEDIAN) += ts_filter_median.o obj-$(CONFIG_TOUCHSCREEN_FILTER_MEAN) += ts_filter_mean.o +obj-$(CONFIG_TOUCHSCREEN_PCAP7200) += pcap7200_ts.o -- cgit v1.2.3