diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2006-12-06 20:40:29 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:45 -0800 |
| commit | 9828673d7d24a09fcc3931b3b84c539146979224 (patch) | |
| tree | 85a4d1b5ceda160415384bb45b640d5c8a4edd5a /drivers/block/paride/bpck6.c | |
| parent | [PATCH] cleanup include/asm-generic/atomic.h (diff) | |
| download | linux-dev-9828673d7d24a09fcc3931b3b84c539146979224.tar.xz linux-dev-9828673d7d24a09fcc3931b3b84c539146979224.zip | |
[PATCH] paride: remove parport #ifdef's
CONFIG_PARIDE depends on CONFIG_PARPORT_PC, so there's no reason for
these #ifdef's.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/paride/bpck6.c')
| -rw-r--r-- | drivers/block/paride/bpck6.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/block/paride/bpck6.c b/drivers/block/paride/bpck6.c index da6b5d27badb..ad124525ac23 100644 --- a/drivers/block/paride/bpck6.c +++ b/drivers/block/paride/bpck6.c @@ -31,10 +31,7 @@ static int verbose; /* set this to 1 to see debugging messages and whatnot */ #include <linux/slab.h> #include <linux/types.h> #include <asm/io.h> - -#if defined(CONFIG_PARPORT_MODULE)||defined(CONFIG_PARPORT) #include <linux/parport.h> -#endif #include "ppc6lnx.c" #include "paride.h" @@ -139,11 +136,6 @@ static int bpck6_test_port ( PIA *pi ) /* check for 8-bit port */ PPCSTRUCT(pi)->ppc_id=pi->unit; PPCSTRUCT(pi)->lpt_addr=pi->port; -#ifdef CONFIG_PARPORT_PC_MODULE -#define CONFIG_PARPORT_PC -#endif - -#ifdef CONFIG_PARPORT_PC /* look at the parport device to see if what modes we can use */ if(((struct pardevice *)(pi->pardev))->port->modes & (PARPORT_MODE_EPP) @@ -161,11 +153,6 @@ static int bpck6_test_port ( PIA *pi ) /* check for 8-bit port */ { return 1; } -#else - /* there is no way of knowing what kind of port we have - default to the highest mode possible */ - return 5; -#endif } static int bpck6_probe_unit ( PIA *pi ) |