diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
| commit | ea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch) | |
| tree | 4c859976b6acc1301d2c8822be6f21b0381f45fc /arch/parisc/lib/iomap.c | |
| parent | 8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff) | |
| parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/parisc/lib/iomap.c')
| -rw-r--r-- | arch/parisc/lib/iomap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c index 01bec8fcbd0..f4a811690ab 100644 --- a/arch/parisc/lib/iomap.c +++ b/arch/parisc/lib/iomap.c @@ -263,11 +263,7 @@ static const struct iomap_ops iomem_ops = { const struct iomap_ops *iomap_ops[8] = { [0] = &ioport_ops, -#ifdef CONFIG_DEBUG_IOREMAP - [6] = &iomem_ops, -#else [7] = &iomem_ops -#endif }; |