From 5c17732b2be6c5b98e6b4559012c2c4f7da784d8 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Tue, 3 Apr 2012 17:15:00 +0000 Subject: [PATCH] --- yaml --- r: 330367 b: refs/heads/master c: 12e36309f8774f4ccc769d5e3ff11ef092e524bc h: refs/heads/master i: 330365: 1eea5e7011e6af58c1fc77b31c59c24142fc7993 330363: 9f5de8ec2dbd9cbb9998b73037e964db166ee4df 330359: aca1f645116b47d5306698f7d561fa3d1b611f25 330351: 7dd6e73792a35a87c97bc208920b0031510a52f3 330335: c459cf0eb9340756afa2d10d3219e0560419352c 330303: 90a4adf8eede172b7a5951206bda2e8076813f2f 330239: b0d300942ec7c86527104de48b5ed3654d6c3164 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/512x/Kconfig | 1 + trunk/arch/powerpc/platforms/512x/mpc512x_shared.c | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ac945d23acf6..c50d5e057371 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fca826460e55d4e8f2deceb09f22f9340a0db24c +refs/heads/master: 12e36309f8774f4ccc769d5e3ff11ef092e524bc diff --git a/trunk/arch/powerpc/platforms/512x/Kconfig b/trunk/arch/powerpc/platforms/512x/Kconfig index c16999802ecf..b62508b113db 100644 --- a/trunk/arch/powerpc/platforms/512x/Kconfig +++ b/trunk/arch/powerpc/platforms/512x/Kconfig @@ -2,6 +2,7 @@ config PPC_MPC512x bool "512x-based boards" depends on 6xx select FSL_SOC + select FB_FSL_DIU select IPIC select PPC_CLOCK select PPC_PCI_CHOICE diff --git a/trunk/arch/powerpc/platforms/512x/mpc512x_shared.c b/trunk/arch/powerpc/platforms/512x/mpc512x_shared.c index cfe958e94e1e..1650e090ef3a 100644 --- a/trunk/arch/powerpc/platforms/512x/mpc512x_shared.c +++ b/trunk/arch/powerpc/platforms/512x/mpc512x_shared.c @@ -191,8 +191,6 @@ mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port) static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb; -#if defined(CONFIG_FB_FSL_DIU) || \ - defined(CONFIG_FB_FSL_DIU_MODULE) static inline void mpc512x_free_bootmem(struct page *page) { __ClearPageReserved(page); @@ -220,7 +218,6 @@ void mpc512x_release_bootmem(void) } diu_ops.release_bootmem = NULL; } -#endif /* * Check if DIU was pre-initialized. If so, perform steps @@ -323,15 +320,12 @@ void __init mpc512x_setup_diu(void) } } -#if defined(CONFIG_FB_FSL_DIU) || \ - defined(CONFIG_FB_FSL_DIU_MODULE) diu_ops.get_pixel_format = mpc512x_get_pixel_format; diu_ops.set_gamma_table = mpc512x_set_gamma_table; diu_ops.set_monitor_port = mpc512x_set_monitor_port; diu_ops.set_pixel_clock = mpc512x_set_pixel_clock; diu_ops.valid_monitor_port = mpc512x_valid_monitor_port; diu_ops.release_bootmem = mpc512x_release_bootmem; -#endif } void __init mpc512x_init_IRQ(void)