diff options
author | Olof Johansson <olof@lixom.net> | 2008-02-05 01:27:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:08 -0500 |
commit | 906da809c5be30b4c7f32bb6a489fb25ad794878 (patch) | |
tree | 9516df9eb1a64ee94d185d2711bde3d1defaabb5 /drivers/bluetooth | |
parent | ecb8a8472f6d314096f20885722f2033d2071719 (diff) |
pcmcia: replace kio_addr_t with unsigned int everywhere
Remove kio_addr_t, and replace it with unsigned int. No known architecture
needs more than 32 bits for IO addresses and ports and having a separate type
for it is just messy.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index a18f9b8c9e12..7703d6e06fd9 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -704,7 +704,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t * | |||
704 | 704 | ||
705 | static int bt3c_config(struct pcmcia_device *link) | 705 | static int bt3c_config(struct pcmcia_device *link) |
706 | { | 706 | { |
707 | static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 707 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |
708 | bt3c_info_t *info = link->priv; | 708 | bt3c_info_t *info = link->priv; |
709 | tuple_t tuple; | 709 | tuple_t tuple; |
710 | u_short buf[256]; | 710 | u_short buf[256]; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index dade1626865b..68d1d258e6a4 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -634,7 +634,7 @@ static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t * | |||
634 | 634 | ||
635 | static int btuart_config(struct pcmcia_device *link) | 635 | static int btuart_config(struct pcmcia_device *link) |
636 | { | 636 | { |
637 | static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; | 637 | static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 }; |
638 | btuart_info_t *info = link->priv; | 638 | btuart_info_t *info = link->priv; |
639 | tuple_t tuple; | 639 | tuple_t tuple; |
640 | u_short buf[256]; | 640 | u_short buf[256]; |