diff options
author | Jens Künzer <Jens.Kuenzer@fpga.homeip.net> | 2010-03-06 01:46:16 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-15 09:50:15 -0400 |
commit | 28ca8dd71fc170090edca62cb8129625d01b7760 (patch) | |
tree | afd386c42c2319f877883db6fd55c77958ff75ed /drivers/pcmcia/i82365.h | |
parent | b416cd8efb6ce2661f8f98f603972f0b8f796ee4 (diff) |
pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
Instead of overwriting the I365_CSCINT register, save the old value and
merely change the bits we care about.
Part 1 of a series to allow the ISA irq to be used for Cardbus devices
if the socket's PCI irq is unusable.
[linux@dominikbrodowski.net: split up the original patch, commit message]
Signed-off-by: Jens Kuenzer <Jens.Kuenzer@fpga.homeip.net>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/i82365.h')
-rw-r--r-- | drivers/pcmcia/i82365.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/i82365.h b/drivers/pcmcia/i82365.h index 849ef1b5d687..3f84d7a2dc84 100644 --- a/drivers/pcmcia/i82365.h +++ b/drivers/pcmcia/i82365.h | |||
@@ -95,6 +95,7 @@ | |||
95 | #define I365_CSC_DETECT 0x08 | 95 | #define I365_CSC_DETECT 0x08 |
96 | #define I365_CSC_ANY 0x0F | 96 | #define I365_CSC_ANY 0x0F |
97 | #define I365_CSC_GPI 0x10 | 97 | #define I365_CSC_GPI 0x10 |
98 | #define I365_CSC_IRQ_MASK 0xF0 | ||
98 | 99 | ||
99 | /* Flags for I365_ADDRWIN */ | 100 | /* Flags for I365_ADDRWIN */ |
100 | #define I365_ENA_IO(map) (0x40 << (map)) | 101 | #define I365_ENA_IO(map) (0x40 << (map)) |