diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-27 12:47:17 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-27 12:47:17 +1000 |
| commit | 9aae341287f55d5fc71f8a884e671f9058ad3388 (patch) | |
| tree | 974ce958e70c0afd0a81cdda6f30d9a037470a98 /arch/powerpc/platforms/512x/mpc512x_shared.c | |
| parent | caa1d631fc99940f866480c2bb88a6f5a235e7a2 (diff) | |
| parent | 9d9fd8871b4136755160bf95a9abd0d23d738ddc (diff) | |
Merge remote-tracking branch 'agust/next' into next
mpc5xxx updates from Anatolij
Diffstat (limited to 'arch/powerpc/platforms/512x/mpc512x_shared.c')
| -rw-r--r-- | arch/powerpc/platforms/512x/mpc512x_shared.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c index cfe958e94e1..1650e090ef3 100644 --- a/arch/powerpc/platforms/512x/mpc512x_shared.c +++ b/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) |