Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / arch / arm / include / asm / arch-tegra / dc.h

diff --git a/arch/arm/include/asm/arch-tegra/dc.h b/arch/arm/include/asm/arch-tegra/dc.h
index 6ffb4683959e92d206fe9f4600d496595a3d7330..3a7ee5e77baf8b690818989aee390095831104b7 100644 (file)
--- a/arch/arm/include/asm/arch-tegra/dc.h
+++ b/arch/arm/include/asm/arch-tegra/dc.h
@@ -364,8 +364,6 @@ struct dc_ctlr {
        struct dc_winbuf_reg winbuf;    /* WINBUF A/B/C 0x800 ~ 0x80d */
 };
 
-#define BIT(pos)       (1U << pos)
-
 /* DC_CMD_DISPLAY_COMMAND 0x032 */
 #define CTRL_MODE_SHIFT                5
 #define CTRL_MODE_MASK         (0x3 << CTRL_MODE_SHIFT)
@@ -568,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 */