diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-02 16:14:18 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-02 16:14:18 +0100 |
| commit | 9c65a818d937d564902a156c3c5030d815e5ca22 (patch) | |
| tree | 1b30dccc3d90658655de162485dac6a0724d4184 /arch | |
| parent | 7e37cbc0439a0b63915ad5f5088086c1615ad322 (diff) | |
colibri_t20: backlight: fix building if CAMERA_INTERFACE is defined
Due to a pin muxing conflict between the regular backlight PWM and the
camera we do have to make this code not CAMERA_INTERFACE define
dependant.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-panel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-panel.c b/arch/arm/mach-tegra/board-colibri_t20-panel.c index 2f2ecd552746..2237c2aa768f 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-panel.c +++ b/arch/arm/mach-tegra/board-colibri_t20-panel.c @@ -419,10 +419,12 @@ static struct nvhost_device colibri_t20_disp1_device = { }, }; +#ifndef CAMERA_INTERFACE static int colibri_t20_disp1_check_fb(struct device *dev, struct fb_info *info) { return info->device == &colibri_t20_disp1_device.dev; } +#endif /* !CAMERA_INTERFACE */ static struct nvhost_device colibri_t20_disp2_device = { .name = "tegradc", @@ -433,12 +435,12 @@ static struct nvhost_device colibri_t20_disp2_device = { .platform_data = &colibri_t20_disp2_pdata, }, }; -#else +#else /* CONFIG_TEGRA_DC */ static int colibri_t20_disp1_check_fb(struct device *dev, struct fb_info *info) { return 0; } -#endif +#endif /* CONFIG_TEGRA_DC */ #if defined(CONFIG_TEGRA_NVMAP) static struct nvmap_platform_carveout colibri_t20_carveouts[] = { @@ -506,7 +508,7 @@ static void colibri_t20_panel_late_resume(struct early_suspend *h) for (i = 0; i < num_registered_fb; i++) fb_blank(registered_fb[i], FB_BLANK_UNBLANK); } -#endif +#endif /* CONFIG_HAS_EARLYSUSPEND */ int __init colibri_t20_panel_init(void) { |