diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 11:51:39 -0600 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 11:51:39 -0600 |
commit | 877d66856e9de4a6d1ffbf61bec6f830bde4d3bf (patch) | |
tree | 61249ed3466942867666af42c44044ff1e83fdc5 /arch/powerpc/platforms/85xx/p1022_rdk.c | |
parent | db8ff907027b63b02c8cef385ea95445b7a41357 (diff) | |
parent | 12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d (diff) |
Merge remote-tracking branch 'kumar/next' into next
<<
Mostly misc code cleanups in various board ports and adding support for a
new MPC85xx board - ppa8548.
>>
Diffstat (limited to 'arch/powerpc/platforms/85xx/p1022_rdk.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/p1022_rdk.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c index 55ffa1cc380..8c9297112b3 100644 --- a/arch/powerpc/platforms/85xx/p1022_rdk.c +++ b/arch/powerpc/platforms/85xx/p1022_rdk.c @@ -35,17 +35,6 @@ #define CLKDVDR_PXCLK_MASK 0x00FF0000 /** - * p1022rdk_set_monitor_port: switch the output to a different monitor port - */ -static void p1022rdk_set_monitor_port(enum fsl_diu_monitor_port port) -{ - if (port != FSL_DIU_PORT_DVI) { - pr_err("p1022rdk: unsupported monitor port %i\n", port); - return; - } -} - -/** * p1022rdk_set_pixel_clock: program the DIU's clock * * @pixclock: the wavelength, in picoseconds, of the clock @@ -124,7 +113,6 @@ static void __init p1022_rdk_setup_arch(void) ppc_md.progress("p1022_rdk_setup_arch()", 0); #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE) - diu_ops.set_monitor_port = p1022rdk_set_monitor_port; diu_ops.set_pixel_clock = p1022rdk_set_pixel_clock; diu_ops.valid_monitor_port = p1022rdk_valid_monitor_port; #endif |