summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/arch-tegra
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-30 16:37:47 -0700
committerTom Warren <twarren@nvidia.com>2016-02-16 09:17:51 -0700
commit4dd811581ab8d85a9ac01ef49d5afbb697660976 (patch)
tree00564fb11102a2bb1d59fb4410e1928dcdf87db6 /arch/arm/include/asm/arch-tegra
parent7429b9623b9d636d6fc686db3af29cc79d901bc6 (diff)
downloadtalos-obmc-uboot-4dd811581ab8d85a9ac01ef49d5afbb697660976.tar.gz
talos-obmc-uboot-4dd811581ab8d85a9ac01ef49d5afbb697660976.zip
tegra: lcd: Merge tegra124-lcd.c into display.c
There isn't a lot of benefit of have two separate files. With driver model the code needs to be in the same driver, so it's better to have it in the same file. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'arch/arm/include/asm/arch-tegra')
-rw-r--r--arch/arm/include/asm/arch-tegra/dc.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h
index 3a87f0b956..3a7ee5e77b 100644
--- a/arch/arm/include/asm/arch-tegra/dc.h
+++ b/arch/arm/include/asm/arch-tegra/dc.h
@@ -566,9 +566,4 @@ enum {
#define DC_N_WINDOWS 5
#define DC_REG_SAVE_SPACE (DC_N_WINDOWS + 5)
-struct display_timing;
-
-int display_init(void *lcdbase, int fb_bits_per_pixel,
- struct display_timing *timing);
-
#endif /* __ASM_ARCH_TEGRA_DC_H */
OpenPOWER on IntegriCloud