From 7d73c516e2a5cd89b32e26af05e0a53736269e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 12 Feb 2010 21:58:11 +0100 Subject: [PATCH] --- yaml --- r: 187771 b: refs/heads/master c: dfff0615d28bdb3e8d213e5537dd069265912667 h: refs/heads/master i: 187769: 70d98096f47a701f6da84f45ec42c1ba422e4dc5 187767: 3594cb8e446f643d0cce9700e214d9d4c37b59c3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/davinci.c | 2 +- trunk/drivers/zorro/zorro.ids | 2 +- trunk/include/net/irda/irttp.h | 2 +- trunk/kernel/irq/chip.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4ac867106f12..09ccc8ccd5f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b79b264ce04e2acd24330140e147801cdbaa39f +refs/heads/master: dfff0615d28bdb3e8d213e5537dd069265912667 diff --git a/trunk/drivers/usb/musb/davinci.c b/trunk/drivers/usb/musb/davinci.c index 66913811af5e..a883f9dd3f8a 100644 --- a/trunk/drivers/usb/musb/davinci.c +++ b/trunk/drivers/usb/musb/davinci.c @@ -274,7 +274,7 @@ static irqreturn_t davinci_interrupt(int irq, void *__hci) /* NOTE: DaVinci shadows the Mentor IRQs. Don't manage them through * the Mentor registers (except for setup), use the TI ones and EOI. * - * Docs describe irq "vector" registers asociated with the CPPI and + * Docs describe irq "vector" registers associated with the CPPI and * USB EOI registers. These hold a bitmask corresponding to the * current IRQ, not an irq handler address. Would using those bits * resolve some of the races observed in this dispatch code?? diff --git a/trunk/drivers/zorro/zorro.ids b/trunk/drivers/zorro/zorro.ids index 0c0f99e2dd62..de24e3decedd 100644 --- a/trunk/drivers/zorro/zorro.ids +++ b/trunk/drivers/zorro/zorro.ids @@ -108,7 +108,7 @@ 0c00 500XP/SupraDrive WordSync [SCSI Host Adapter] 0d00 SupraDrive WordSync II [SCSI Host Adapter] 1000 2400zi+ [Modem] -0422 Computer Systems Assosiates +0422 Computer Systems Associates 1100 Magnum 40 [Accelerator and SCSI Host Adapter] 1500 12 Gauge [SCSI Host Adapter] 0439 Marc Michael Groth diff --git a/trunk/include/net/irda/irttp.h b/trunk/include/net/irda/irttp.h index 0788c23d2828..11aee7a2972a 100644 --- a/trunk/include/net/irda/irttp.h +++ b/trunk/include/net/irda/irttp.h @@ -97,7 +97,7 @@ #define TTP_MAX_SDU_SIZE 0x01 /* - * This structure contains all data assosiated with one instance of a TTP + * This structure contains all data associated with one instance of a TTP * connection. */ struct tsap_cb { diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c index ecc3fa28f666..ec8a96382461 100644 --- a/trunk/kernel/irq/chip.c +++ b/trunk/kernel/irq/chip.c @@ -520,7 +520,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc) * signal. The occurence is latched into the irq controller hardware * and must be acked in order to be reenabled. After the ack another * interrupt can happen on the same source even before the first one - * is handled by the assosiacted event handler. If this happens it + * is handled by the associated event handler. If this happens it * might be necessary to disable (mask) the interrupt depending on the * controller hardware. This requires to reenable the interrupt inside * of the loop which handles the interrupts which have arrived while