Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6

[mv-sheeva.git] / arch / powerpc / kernel / dma-swiotlb.c

diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
index e7fe218b86978e52b2ff50f9d34c6efbd4b64790..4295e0b94b2db31238f008c49756955fd4922702 100644 (file)
--- a/arch/powerpc/kernel/dma-swiotlb.c
+++ b/arch/powerpc/kernel/dma-swiotlb.c
@@ -71,7 +71,7 @@ static int ppc_swiotlb_bus_notify(struct notifier_block *nb,
        sd->max_direct_dma_addr = 0;
 
        /* May need to bounce if the device can't address all of DRAM */
-       if ((dma_get_mask(dev) + 1) < lmb_end_of_DRAM())
+       if ((dma_get_mask(dev) + 1) < memblock_end_of_DRAM())
                set_dma_ops(dev, &swiotlb_dma_ops);
 
        return NOTIFY_DONE;
@@ -82,17 +82,9 @@ static struct notifier_block ppc_swiotlb_plat_bus_notifier = {
        .priority = 0,
 };
 
-static struct notifier_block ppc_swiotlb_of_bus_notifier = {
-       .notifier_call = ppc_swiotlb_bus_notify,
-       .priority = 0,
-};
-
 int __init swiotlb_setup_bus_notifier(void)
 {
        bus_register_notifier(&platform_bus_type,
                              &ppc_swiotlb_plat_bus_notifier);
-       bus_register_notifier(&of_platform_bus_type,
-                             &ppc_swiotlb_of_bus_notifier);
-
        return 0;
 }