paride: depend on !HIGHMEM

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index a2184b42849361791f4d7d027dc3c46bf9a2e569..c100ab1800edb8ebea86390833eb7ffc5a281d47 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -105,7 +105,7 @@ config GDROM
 
 config PARIDE
        tristate "Parallel port IDE device support"
-       depends on PARPORT_PC
+       depends on PARPORT_PC && !HIGHMEM
        help
          There are many external CD-ROM and disk devices that connect through
          your computer's parallel port. Most of them are actually IDE devices

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index a5ab407841193ef2641d57e8de9745614cd21284..e456682b3d1193b1025c6c8439d241eeda79d01c 100644 (file)
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -908,7 +908,6 @@ static int pcd_init_unit(struct pcd_unit *cd, bool autoprobe, int port,
        }
 
        INIT_LIST_HEAD(&cd->rq_list);
-       blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
        cd->disk = disk;
        cd->pi = &cd->pia;
        cd->present = 0;

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index f8a75bc90f70c8b4af8d7f095957fa872342aff1..cb8a5e7615d843b09e86af150208f9bea54db889 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -926,7 +926,6 @@ static int pd_probe_drive(struct pd_unit *disk, int autoprobe, int port,
        p->events = DISK_EVENT_MEDIA_CHANGE;
        p->private_data = disk;
        blk_queue_max_hw_sectors(p->queue, cluster);
-       blk_queue_bounce_limit(p->queue, BLK_BOUNCE_HIGH);
 
        if (disk->drive == -1) {
                for (disk->drive = 0; disk->drive <= 1; disk->drive++) {

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index eec1b9fde2450d434d5a53b5597e14d90aeda957..35ad024d40847d7693c47f645a97598b0427b400 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -947,7 +947,6 @@ static int __init pf_init_unit(struct pf_unit *pf, bool autoprobe, int port,
        disk->private_data = pf;
 
        blk_queue_max_segments(disk->queue, cluster);
-       blk_queue_bounce_limit(disk->queue, BLK_BOUNCE_HIGH);
 
        INIT_LIST_HEAD(&pf->rq_list);
        pf->disk = disk;