Merge branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-davinci / da8xx-fb.h

diff --git a/arch/arm/include/asm/arch-davinci/da8xx-fb.h b/arch/arm/include/asm/arch-davinci/da8xx-fb.h
index 6d2327c8c06d037ada81dc84262c562750fede88..a9181d89c5f24ef0b20c2a73f6d1429eef049e21 100644 (file)
--- a/arch/arm/include/asm/arch-davinci/da8xx-fb.h
+++ b/arch/arm/include/asm/arch-davinci/da8xx-fb.h
@@ -123,4 +123,3 @@ struct lcd_sync_arg {
 void da8xx_video_init(const struct da8xx_panel *panel, int bits_pixel);
 
 #endif  /* ifndef DA8XX_FB_H */
-