diff options
-rw-r--r-- | drivers/usb/musb/davinci.c | 2 | ||||
-rw-r--r-- | drivers/zorro/zorro.ids | 2 | ||||
-rw-r--r-- | include/net/irda/irttp.h | 2 | ||||
-rw-r--r-- | kernel/irq/chip.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 66913811af5e..a883f9dd3f8a 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
@@ -274,7 +274,7 @@ static irqreturn_t davinci_interrupt(int irq, void *__hci) | |||
274 | /* NOTE: DaVinci shadows the Mentor IRQs. Don't manage them through | 274 | /* NOTE: DaVinci shadows the Mentor IRQs. Don't manage them through |
275 | * the Mentor registers (except for setup), use the TI ones and EOI. | 275 | * the Mentor registers (except for setup), use the TI ones and EOI. |
276 | * | 276 | * |
277 | * Docs describe irq "vector" registers asociated with the CPPI and | 277 | * Docs describe irq "vector" registers associated with the CPPI and |
278 | * USB EOI registers. These hold a bitmask corresponding to the | 278 | * USB EOI registers. These hold a bitmask corresponding to the |
279 | * current IRQ, not an irq handler address. Would using those bits | 279 | * current IRQ, not an irq handler address. Would using those bits |
280 | * resolve some of the races observed in this dispatch code?? | 280 | * resolve some of the races observed in this dispatch code?? |
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids index 0c0f99e2dd62..de24e3decedd 100644 --- a/drivers/zorro/zorro.ids +++ b/drivers/zorro/zorro.ids | |||
@@ -108,7 +108,7 @@ | |||
108 | 0c00 500XP/SupraDrive WordSync [SCSI Host Adapter] | 108 | 0c00 500XP/SupraDrive WordSync [SCSI Host Adapter] |
109 | 0d00 SupraDrive WordSync II [SCSI Host Adapter] | 109 | 0d00 SupraDrive WordSync II [SCSI Host Adapter] |
110 | 1000 2400zi+ [Modem] | 110 | 1000 2400zi+ [Modem] |
111 | 0422 Computer Systems Assosiates | 111 | 0422 Computer Systems Associates |
112 | 1100 Magnum 40 [Accelerator and SCSI Host Adapter] | 112 | 1100 Magnum 40 [Accelerator and SCSI Host Adapter] |
113 | 1500 12 Gauge [SCSI Host Adapter] | 113 | 1500 12 Gauge [SCSI Host Adapter] |
114 | 0439 Marc Michael Groth | 114 | 0439 Marc Michael Groth |
diff --git a/include/net/irda/irttp.h b/include/net/irda/irttp.h index 0788c23d2828..11aee7a2972a 100644 --- a/include/net/irda/irttp.h +++ b/include/net/irda/irttp.h | |||
@@ -97,7 +97,7 @@ | |||
97 | #define TTP_MAX_SDU_SIZE 0x01 | 97 | #define TTP_MAX_SDU_SIZE 0x01 |
98 | 98 | ||
99 | /* | 99 | /* |
100 | * This structure contains all data assosiated with one instance of a TTP | 100 | * This structure contains all data associated with one instance of a TTP |
101 | * connection. | 101 | * connection. |
102 | */ | 102 | */ |
103 | struct tsap_cb { | 103 | struct tsap_cb { |
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index ecc3fa28f666..ec8a96382461 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c | |||
@@ -520,7 +520,7 @@ out: | |||
520 | * signal. The occurence is latched into the irq controller hardware | 520 | * signal. The occurence is latched into the irq controller hardware |
521 | * and must be acked in order to be reenabled. After the ack another | 521 | * and must be acked in order to be reenabled. After the ack another |
522 | * interrupt can happen on the same source even before the first one | 522 | * interrupt can happen on the same source even before the first one |
523 | * is handled by the assosiacted event handler. If this happens it | 523 | * is handled by the associated event handler. If this happens it |
524 | * might be necessary to disable (mask) the interrupt depending on the | 524 | * might be necessary to disable (mask) the interrupt depending on the |
525 | * controller hardware. This requires to reenable the interrupt inside | 525 | * controller hardware. This requires to reenable the interrupt inside |
526 | * of the loop which handles the interrupts which have arrived while | 526 | * of the loop which handles the interrupts which have arrived while |