diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-12-16 14:11:14 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:18:46 -0700 |
| commit | a1f96a4240af379b19c76cf1eb737204324bc5ee (patch) | |
| tree | c258c5f0fe8b2826db3d1b8221b5e852b6592102 /drivers/misc/Kconfig | |
| parent | fedd946d764b864599de9edb0bc9ffd99e345e79 (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
Rebase-Id: R62886bc4bfdcb509c7930649db34eb828a5e1c26
Diffstat (limited to 'drivers/misc/Kconfig')
| -rw-r--r-- | drivers/misc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 752bb4b287d7..2ebf2c9e934a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -533,6 +533,5 @@ source "drivers/misc/ti-st/Kconfig" source "drivers/misc/lis3lv02d/Kconfig" source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" -source "drivers/misc/mpu3050/Kconfig" source "drivers/misc/inv_mpu/Kconfig" endmenu |