| Message ID | 1305049846-13816-1-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Accepted |
| Commit | c08f68c2995ddaaf291efb2ec87a89c50b17ec96 |
| Delegated to: | Stefano Babic |
| Headers | show |
On 05/10/2011 07:50 PM, Fabio Estevam wrote: > Currently the fb_videomode struct is only declared if CONFIG_HW_WATCHDOG is defined. > > Remove this dependancy and let the video struct always be declared. > > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- Applied to u-boot-imx, thanks. Best regards, Stefano Babic
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index f8ef4fc..0a3789c 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -45,9 +45,6 @@ static u32 system_rev; extern int mx51_fb_init(struct fb_videomode *mode); -#ifdef CONFIG_HW_WATCHDOG -#include <watchdog.h> - static struct fb_videomode nec_nl6448bc26_09c = { "NEC_NL6448BC26-09C", 60, /* Refresh */ @@ -65,6 +62,8 @@ static struct fb_videomode nec_nl6448bc26_09c = { 0, /* flag */ }; +#ifdef CONFIG_HW_WATCHDOG +#include <watchdog.h> void hw_watchdog_reset(void) { int val;
Currently the fb_videomode struct is only declared if CONFIG_HW_WATCHDOG is defined. Remove this dependancy and let the video struct always be declared. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- board/ttcontrol/vision2/vision2.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)