Fix compilation errors due to merge
authorPradeep Kumar <pgoudagunta@nvidia.com>
Mon, 6 Aug 2012 17:33:12 +0000 (22:33 +0530)
committerVarun Colbert <vcolbert@nvidia.com>
Tue, 7 Aug 2012 22:23:11 +0000 (15:23 -0700)
commit92f18b11534e02bbd3297c89d2ac7baaa85b79c5
treefd9d60945633751e80d451d49d170a6d0ec7ce19
parentb8b641f5e81434ebb721b3998218645b5190bc25
Fix compilation errors due to merge

Change-Id: I1067e7b9ab829bc6629eb79c1edd36dc1327e281
Reviewed-on: http://git-master/r/121393
Reviewed-by: Bo Yan <byan@nvidia.com>
Tested-by: Bo Yan <byan@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
16 files changed:
arch/arm/kernel/devtree.c
arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-enterprise.c
arch/arm/mach-tegra/dvfs.h
arch/arm/mach-tegra/include/mach/tegra_asoc_pdata.h
arch/arm/mach-tegra/tegra11x_usb_phy.c
arch/arm/mach-tegra/timer.h
drivers/i2c/busses/i2c-tegra.c
drivers/input/touchscreen/atmel_mxt_ts.c
drivers/misc/tegra-throughput.c
drivers/mmc/host/sdhci.c
drivers/regulator/tps80031-regulator.c
drivers/video/tegra/host/gr3d/scale3d.c
include/linux/mmc/host.h
sound/soc/tegra/tegra_aic326x.c
sound/soc/tegra/tegra_max98088.c