aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlek Du <alek.du@intel.com>2010-08-25 15:24:14 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-31 15:14:15 -0700
commit9453ed9cc7913d9f829aed3371196837328c2cad (patch)
tree252169c8efd678437efa440962cd113642aceed7
parente1eeeae2bf5ce32d6b0303e6f360c339410cd527 (diff)
downloadkernel_samsung_smdk4412-9453ed9cc7913d9f829aed3371196837328c2cad.zip
kernel_samsung_smdk4412-9453ed9cc7913d9f829aed3371196837328c2cad.tar.gz
kernel_samsung_smdk4412-9453ed9cc7913d9f829aed3371196837328c2cad.tar.bz2
Staging: mrst-touchscreen: Fix wrong Makefile config
The config name is wrong in drivers/staging/Makefile... The object name is wrong in drivers/staging/mrst-touchscreen/Makefile... Signed-off-by: Alek Du <alek.du@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/Makefile2
-rw-r--r--drivers/staging/mrst-touchscreen/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 3645acf..dd2c66f 100644
--- a/drivers/staging/Makefile
+++ b/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/drivers/staging/mrst-touchscreen/Makefile b/drivers/staging/mrst-touchscreen/Makefile
index 2d638b0..155f58b 100644
--- a/drivers/staging/mrst-touchscreen/Makefile
+++ b/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