diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-13 21:44:37 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@mcmartin.ca> | 2009-01-05 13:15:25 -0500 |
commit | 0063507787ee7b385a8cbe7521469acf33341eb6 (patch) | |
tree | 9f8662ba49377a71bca7e30d8c64b11f019df90e /drivers/parisc/ccio-dma.c | |
parent | 022b7690454ebf945d46467fea7b5f47bbb9b420 (diff) |
parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY and
BIO_VMERGE_MAX_SIZE definitions are meaningless now.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'drivers/parisc/ccio-dma.c')
-rw-r--r-- | drivers/parisc/ccio-dma.c | 2 |
1 files changed, 0 insertions, 2 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 | } |