diff options
| author | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-02-08 02:16:06 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-02-17 08:26:47 -0800 |
| commit | 13829c1be066826ddeb0190474077826139e9c27 (patch) | |
| tree | e01de2d7cca40db022c733a329fab444f4688228 /arch/arm/mach-tegra/board-kai-panel.c | |
| parent | 108094ba6375c83ae671ed02bc821d51aaeab068 (diff) | |
arm: tegra: kai: Fix build error without TEGRA_NVMAP
Fix build error without TEGRA_NVMAP
Change-Id: Idbee58471766ab7b6e2a89bc9e994c30b362dd1a
Signed-off-by: Hiroshi DOYU <hdoyu@nvidia.com>
Reviewed-on: http://git-master/r/79897
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai-panel.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-kai-panel.c b/arch/arm/mach-tegra/board-kai-panel.c index e1a5ad5140f0..742633735071 100644 --- a/arch/arm/mach-tegra/board-kai-panel.c +++ b/arch/arm/mach-tegra/board-kai-panel.c @@ -572,6 +572,7 @@ static int kai_disp1_check_fb(struct device *dev, struct fb_info *info) } #endif +#if defined(CONFIG_TEGRA_NVMAP) static struct nvmap_platform_carveout kai_carveouts[] = { [0] = NVMAP_HEAP_CARVEOUT_IRAM_INIT, [1] = { @@ -595,10 +596,12 @@ static struct platform_device kai_nvmap_device = { .platform_data = &kai_nvmap_data, }, }; - +#endif static struct platform_device *kai_gfx_devices[] __initdata = { +#if defined(CONFIG_TEGRA_NVMAP) &kai_nvmap_device, +#endif #ifdef CONFIG_TEGRA_GRHOST &tegra_grhost_device, #endif @@ -638,9 +641,10 @@ int __init kai_panel_init(void) tegra_get_board_info(&board_info); +#if defined(CONFIG_TEGRA_NVMAP) kai_carveouts[1].base = tegra_carveout_start; kai_carveouts[1].size = tegra_carveout_size; - +#endif gpio_request(kai_lvds_avdd_en, "lvds_avdd_en"); gpio_direction_output(kai_lvds_avdd_en, 1); tegra_gpio_enable(kai_lvds_avdd_en); |