diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:33:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 15:33:02 -0500 |
| commit | fb1beb29b5c531b12485d7c32174a77120590481 (patch) | |
| tree | cb7d1d9733d351ae0ec7acda4851b27acd10abca /include/pcmcia/cs.h | |
| parent | 478e4e9d7a618379676b17e64583ff3622f2fec5 (diff) | |
| parent | 9fea84f46a821aa1ff2d034ffda8ad33bff48015 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: CodingStyle fixes
pcmcia: remove unused IRQ_FIRST_SHARED
Diffstat (limited to 'include/pcmcia/cs.h')
| -rw-r--r-- | include/pcmcia/cs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index afc2bfb9e917..75fa3530345b 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h | |||
| @@ -126,8 +126,8 @@ typedef struct irq_req_t { | |||
| 126 | #define IRQ_TYPE_TIME 0x01 | 126 | #define IRQ_TYPE_TIME 0x01 |
| 127 | #define IRQ_TYPE_DYNAMIC_SHARING 0x02 | 127 | #define IRQ_TYPE_DYNAMIC_SHARING 0x02 |
| 128 | #define IRQ_FORCED_PULSE 0x04 | 128 | #define IRQ_FORCED_PULSE 0x04 |
| 129 | #define IRQ_FIRST_SHARED 0x08 | 129 | #define IRQ_FIRST_SHARED 0x08 /* unused */ |
| 130 | //#define IRQ_HANDLE_PRESENT 0x10 | 130 | #define IRQ_HANDLE_PRESENT 0x10 /* unused */ |
| 131 | #define IRQ_PULSE_ALLOCATED 0x100 | 131 | #define IRQ_PULSE_ALLOCATED 0x100 |
| 132 | 132 | ||
| 133 | /* Bits in IRQInfo1 field */ | 133 | /* Bits in IRQInfo1 field */ |