diff options
Diffstat (limited to 'packages/linux/linux-2.6.28/tosa/commit-ddfb33c')
-rw-r--r-- | packages/linux/linux-2.6.28/tosa/commit-ddfb33c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/packages/linux/linux-2.6.28/tosa/commit-ddfb33c b/packages/linux/linux-2.6.28/tosa/commit-ddfb33c new file mode 100644 index 0000000000..4f3278afe3 --- /dev/null +++ b/packages/linux/linux-2.6.28/tosa/commit-ddfb33c @@ -0,0 +1,39 @@ +commit ddfb33c0ffbd8b8f5984de5a8f9513b88cd28b67 +Author: Dmitry Baryshkov <dbaryshkov@gmail.com> +Date: Thu Nov 27 01:25:09 2008 +0300 + + [ARM] pxa/tosa: fix building w/o TC6393XB driver + + Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> + Signed-off-by: Eric Miao <eric.miao@marvell.com> + +diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c +index 366a533..c46b640 100644 +--- a/arch/arm/mach-pxa/tosa.c ++++ b/arch/arm/mach-pxa/tosa.c +@@ -733,6 +733,7 @@ static void tosa_tc6393xb_teardown(struct platform_device *dev) + gpio_free(TOSA_GPIO_CARD_VCC_ON); + } + ++#ifdef CONFIG_MFD_TC6393XB + static struct fb_videomode tosa_tc6393xb_lcd_mode[] = { + { + .xres = 480, +@@ -769,6 +770,7 @@ static struct tmio_fb_data tosa_tc6393xb_fb_config = { + .height = 82, + .width = 60, + }; ++#endif + + static struct tc6393xb_platform_data tosa_tc6393xb_data = { + .scr_pll2cr = 0x0cc1, +@@ -785,7 +787,9 @@ static struct tc6393xb_platform_data tosa_tc6393xb_data = { + .resume = tosa_tc6393xb_resume, + + .nand_data = &tosa_tc6393xb_nand_config, ++#ifdef CONFIG_MFD_TC6393XB + .fb_data = &tosa_tc6393xb_fb_config, ++#endif + + .resume_restore = 1, + }; |