]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] pxa/tosa: fix building w/o TC6393XB driver
authorDmitry Baryshkov <dbaryshkov@gmail.com>
Wed, 26 Nov 2008 22:25:09 +0000 (01:25 +0300)
committerEric Miao <eric.miao@marvell.com>
Tue, 2 Dec 2008 06:43:49 +0000 (14:43 +0800)
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
arch/arm/mach-pxa/tosa.c

index 366a533b33a985012b11672cf555fd186b79258c..c46b640e453d5563bd95547df1feea72026e09e6 100644 (file)
@@ -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,
 };