diff options
Diffstat (limited to 'drivers/parisc')
-rw-r--r-- | drivers/parisc/ccio-dma.c | 2 | ||||
-rw-r--r-- | drivers/parisc/sba_iommu.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index 5ff90dd26fe6..cd4dd7ed2c06 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -1578,8 +1578,6 @@ static int __init ccio_probe(struct parisc_device *dev) | |||
1578 | 1578 | ||
1579 | ioc_count++; | 1579 | ioc_count++; |
1580 | 1580 | ||
1581 | parisc_vmerge_boundary = IOVP_SIZE; | ||
1582 | parisc_vmerge_max_size = BITS_PER_LONG * IOVP_SIZE; | ||
1583 | parisc_has_iommu(); | 1581 | parisc_has_iommu(); |
1584 | return 0; | 1582 | return 0; |
1585 | } | 1583 | } |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index 34763e27a9c1..3fac8f81d59d 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -1978,8 +1978,6 @@ static int sba_driver_callback(struct parisc_device *dev) | |||
1978 | proc_create("sba_iommu-bitmap", 0, root, &sba_proc_bitmap_fops); | 1978 | proc_create("sba_iommu-bitmap", 0, root, &sba_proc_bitmap_fops); |
1979 | #endif | 1979 | #endif |
1980 | 1980 | ||
1981 | parisc_vmerge_boundary = IOVP_SIZE; | ||
1982 | parisc_vmerge_max_size = IOVP_SIZE * BITS_PER_LONG; | ||
1983 | parisc_has_iommu(); | 1981 | parisc_has_iommu(); |
1984 | return 0; | 1982 | return 0; |
1985 | } | 1983 | } |