diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-08-25 14:04:14 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:40 -0800 |
| commit | bceb821e47648ff7e63be15af9373a8c3ad11852 (patch) | |
| tree | af428df1e20489f7b2385efd9ab8aa523d8a2f68 /arch/arm/mach-tegra/board-cardhu-sdhci.c | |
| parent | b537870ed1880f7f52eec17e115727a53b58ed27 (diff) | |
ARM: tegra: cardhu: Fix (or suppress) warnings
Change-Id: Ie1ec67106ffb4cf38415095a8db31d01fe1d5e10
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-on: http://git-master/r/49274
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R23e65a63d3f2869217af5cc7952ea64931ba4924
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-sdhci.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-sdhci.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-sdhci.c b/arch/arm/mach-tegra/board-cardhu-sdhci.c index af1a502a42ab..cee4b6190f73 100644 --- a/arch/arm/mach-tegra/board-cardhu-sdhci.c +++ b/arch/arm/mach-tegra/board-cardhu-sdhci.c @@ -212,8 +212,8 @@ static int pm269_sd_wp_gpio_init(void) int __init cardhu_sdhci_init(void) { - unsigned int rc = 0; #if 0 + unsigned int rc = 0; struct board_info board_info; tegra_get_board_info(&board_info); if (board_info.board_id == BOARD_PM269) { @@ -234,20 +234,25 @@ int __init cardhu_sdhci_init(void) #endif platform_device_register(&tegra_sdhci_device3); -// platform_device_register(&tegra_sdhci_device2); - #if 0 + platform_device_register(&tegra_sdhci_device2); + /* Fix ME: The gpios have to enabled for hot plug support */ rc = cardhu_sd_cd_gpio_init(); if (!rc) { tegra_sdhci_platform_data0.cd_gpio = CARDHU_SD_CD; tegra_sdhci_platform_data0.cd_gpio_polarity = 0; } -#endif - + platform_device_register(&tegra_sdhci_device0); -// platform_device_register(&tegra_sdhci_device0); +#else + (void)tegra_sdhci_device0; + (void)tegra_sdhci_device2; + (void)cardhu_sd_cd_gpio_init; + (void)cardhu_sd_wp_gpio_init; + (void)pm269_sd_wp_gpio_init; +#endif return 0; } |