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 /arch/parisc/include | |
| 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 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/io.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h index 55ddb1842107..b92efb307e2e 100644 --- a/arch/parisc/include/asm/io.h +++ b/arch/parisc/include/asm/io.h | |||
| @@ -4,12 +4,6 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <asm/pgtable.h> | 5 | #include <asm/pgtable.h> |
| 6 | 6 | ||
| 7 | extern unsigned long parisc_vmerge_boundary; | ||
| 8 | extern unsigned long parisc_vmerge_max_size; | ||
| 9 | |||
| 10 | #define BIO_VMERGE_BOUNDARY parisc_vmerge_boundary | ||
| 11 | #define BIO_VMERGE_MAX_SIZE parisc_vmerge_max_size | ||
| 12 | |||
| 13 | #define virt_to_phys(a) ((unsigned long)__pa(a)) | 7 | #define virt_to_phys(a) ((unsigned long)__pa(a)) |
| 14 | #define phys_to_virt(a) __va(a) | 8 | #define phys_to_virt(a) __va(a) |
| 15 | #define virt_to_bus virt_to_phys | 9 | #define virt_to_bus virt_to_phys |