From 0f9a379222f24d459d07c7d5327fdb93b72c2b10 Mon Sep 17 00:00:00 2001 From: Alek Du Date: Wed, 25 Aug 2010 15:24:14 +0100 Subject: [PATCH] --- yaml --- r: 219707 b: refs/heads/master c: 9453ed9cc7913d9f829aed3371196837328c2cad h: refs/heads/master i: 219705: 9ee95dc6662b5b005093dc8e20cbab3a9a485063 219703: 979ab3cb4e10bf8ed0e46a96b29243781deaf08c v: v3 --- [refs] | 2 +- trunk/drivers/staging/Makefile | 2 +- trunk/drivers/staging/mrst-touchscreen/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d764128fcee..9693e3062156 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1eeeae2bf5ce32d6b0303e6f360c339410cd527 +refs/heads/master: 9453ed9cc7913d9f829aed3371196837328c2cad diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index 3645acf8da83..dd2c66fdf979 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/drivers/staging/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_CXT1E1) += cxt1e1/ obj-$(CONFIG_TI_ST) += ti-st/ obj-$(CONFIG_ADIS16255) += adis16255/ obj-$(CONFIG_FB_XGI) += xgifb/ -obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/ +obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += mrst-touchscreen/ obj-$(CONFIG_MSM_STAGING) += msm/ obj-$(CONFIG_EASYCAP) += easycap/ obj-$(CONFIG_SOLO6X10) += solo6x10/ diff --git a/trunk/drivers/staging/mrst-touchscreen/Makefile b/trunk/drivers/staging/mrst-touchscreen/Makefile index 2d638b0d70bf..155f58b57dbe 100644 --- a/trunk/drivers/staging/mrst-touchscreen/Makefile +++ b/trunk/drivers/staging/mrst-touchscreen/Makefile @@ -1,3 +1,3 @@ -obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel_mid_touch.o +obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel-mid-touch.o