summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-12-16 14:11:14 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-12-16 14:18:35 -0800
commit47a3eb2ca3afa0f864f2572081a77e8ed6391f9f (patch)
tree644c7d97f205ef4cb8f8223cac008c1ca005d797 /drivers/misc
parenta5147a46fae2d9dce715a5354fa280eb57210c11 (diff)
misc: Fix bad merge of MPU Kconfig
Commit 7fbb6eaca74d961fde208be87c89d703d5eff5ad in android-tegra-nv-2.6.39 replaced mpu3050 with inv_mpu. The cherry-picked commit on this tree just adds inv_mpu commit f1e961e877025f60cc409180350a3def85f26f64 Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com> Change-Id: I46194ea10cc8154c50a8b16c163bedf29a35d544 Reviewed-on: http://git-master/r/70628
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 958577a840dd..1be15a47c873 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -573,7 +573,6 @@ source "drivers/misc/iwmc3200top/Kconfig"
source "drivers/misc/ti-st/Kconfig"
source "drivers/misc/lis3lv02d/Kconfig"
source "drivers/misc/carma/Kconfig"
-source "drivers/misc/mpu3050/Kconfig"
source "drivers/misc/inv_mpu/Kconfig"
source "drivers/misc/tegra-baseband/Kconfig"