| 1 | From 1ebacc69cb9b9c2508b1e75cb23ef572cda51eec Mon Sep 17 00:00:00 2001 |
| 2 | From: Alison Wang <b18965@freescale.com> |
| 3 | Date: Thu, 4 Aug 2011 09:59:47 +0800 |
| 4 | Subject: [PATCH 33/52] Fix structure fsl_ssd1289_data definition bug for SSD1289 FB driver |
| 5 | |
| 6 | Fix the bug that structure fsl_ssd1289_data definition depends on |
| 7 | DSPI enabled for SSD1289 framebuffer driver. |
| 8 | |
| 9 | Signed-off-by: Alison Wang <b18965@freescale.com> |
| 10 | --- |
| 11 | arch/m68k/coldfire/m5441x/devices.c | 20 ++++++++++---------- |
| 12 | 1 files changed, 10 insertions(+), 10 deletions(-) |
| 13 | |
| 14 | --- a/arch/m68k/coldfire/m5441x/devices.c |
| 15 | +++ b/arch/m68k/coldfire/m5441x/devices.c |
| 16 | @@ -138,6 +138,16 @@ static struct platform_device nfc_device |
| 17 | }; |
| 18 | #endif |
| 19 | |
| 20 | +#if defined(CONFIG_FB_FSL_SSD1289) || defined(CONFIG_FB_FSL_SSD1289_MODULE) |
| 21 | +static struct fsl_ssd1289_fb_display fsl_ssd1289_data = { |
| 22 | + .width = 320, |
| 23 | + .height = 240, |
| 24 | + .xres = 320, |
| 25 | + .yres = 240, |
| 26 | + .bpp = 16, |
| 27 | +}; |
| 28 | +#endif |
| 29 | + |
| 30 | /* |
| 31 | * DSPI |
| 32 | */ |
| 33 | @@ -197,16 +207,6 @@ static struct coldfire_dspi_chip at26df0 |
| 34 | }; |
| 35 | #endif |
| 36 | |
| 37 | -#if defined(CONFIG_FB_FSL_SSD1289) || defined(CONFIG_FB_FSL_SSD1289_MODULE) |
| 38 | -static struct fsl_ssd1289_fb_display fsl_ssd1289_data = { |
| 39 | - .width = 320, |
| 40 | - .height = 240, |
| 41 | - .xres = 320, |
| 42 | - .yres = 240, |
| 43 | - .bpp = 16, |
| 44 | -}; |
| 45 | -#endif |
| 46 | - |
| 47 | #if defined(CONFIG_SSD1289_SPI_MODE) |
| 48 | static struct coldfire_dspi_chip ssd1289_chip_info = { |
| 49 | .mode = SPI_MODE_0, |
| 50 | |
