Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / parisc / kernel / setup.c

diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 8d3a7b80ac4286c209563051d4e6cf09bebad08d..4e87c35c22b7215722aebbf6a980e2706a15c44a 100644 (file)
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -97,14 +97,12 @@ void __init dma_ops_init(void)
                panic(  "PA-RISC Linux currently only supports machines that conform to\n"
                        "the PA-RISC 1.1 or 2.0 architecture specification.\n");
 
-       case pcxs:
-       case pcxt:
-               hppa_dma_ops = &pcx_dma_ops;
-               break;
        case pcxl2:
                pa7300lc_init();
        case pcxl: /* falls through */
-               hppa_dma_ops = &pcxl_dma_ops;
+       case pcxs:
+       case pcxt:
+               hppa_dma_ops = &dma_noncoherent_ops;
                break;
        default:
                break;