Merge remote-tracking branch 'ecryptfs/next'

[karo-tx-linux.git] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index f6dcde22082155577b3cdf0b0f55f103e059cae6..049c3d0bddd1068edaf01f4a58165047bb1336f0 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -280,9 +280,6 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
        else
                of_device_make_bus_id(&dev->dev);
 
-       /* setup amba-specific device info */
-       dev->dma_mask = ~0;
-
        /* Allow the HW Peripheral ID to be overridden */
        prop = of_get_property(node, "arm,primecell-periphid", NULL);
        if (prop)