diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /drivers/pnp | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/parport_probe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/parport_probe.c b/drivers/pnp/parport_probe.c index 00f3c1f3c..82ba36ef1 100644 --- a/drivers/pnp/parport_probe.c +++ b/drivers/pnp/parport_probe.c @@ -6,9 +6,6 @@ */ #include <linux/tasks.h> -#include <asm/io.h> -#include <asm/dma.h> - #include <linux/parport.h> #include <linux/delay.h> #include <linux/errno.h> @@ -21,7 +18,10 @@ #include <linux/lp.h> +#include <asm/io.h> +#include <asm/dma.h> #include <asm/uaccess.h> + #undef DEBUG_PROBE static inline int read_nibble(struct parport *port) |