diff options
-rw-r--r-- | drivers/dma/shdma.c | 2 | ||||
-rw-r--r-- | drivers/net/atl1c/atl1c.h | 4 | ||||
-rw-r--r-- | drivers/net/sungem.h | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.h | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.h | 2 | ||||
-rw-r--r-- | drivers/usb/wusbcore/rh.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 28720d3103c4..6451b581a70b 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
@@ -750,7 +750,7 @@ static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan) | |||
750 | return; | 750 | return; |
751 | } | 751 | } |
752 | 752 | ||
753 | /* Find the first not transferred desciptor */ | 753 | /* Find the first not transferred descriptor */ |
754 | list_for_each_entry(desc, &sh_chan->ld_queue, node) | 754 | list_for_each_entry(desc, &sh_chan->ld_queue, node) |
755 | if (desc->mark == DESC_SUBMITTED) { | 755 | if (desc->mark == DESC_SUBMITTED) { |
756 | dev_dbg(sh_chan->dev, "Queue #%d to %d: %u@%x -> %x\n", | 756 | dev_dbg(sh_chan->dev, "Queue #%d to %d: %u@%x -> %x\n", |
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/atl1c/atl1c.h index 9ab58097fa2e..7cb375e0e29c 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/drivers/net/atl1c/atl1c.h | |||
@@ -265,7 +265,7 @@ struct atl1c_recv_ret_status { | |||
265 | __le32 word3; | 265 | __le32 word3; |
266 | }; | 266 | }; |
267 | 267 | ||
268 | /* RFD desciptor */ | 268 | /* RFD descriptor */ |
269 | struct atl1c_rx_free_desc { | 269 | struct atl1c_rx_free_desc { |
270 | __le64 buffer_addr; | 270 | __le64 buffer_addr; |
271 | }; | 271 | }; |
@@ -531,7 +531,7 @@ struct atl1c_rfd_ring { | |||
531 | struct atl1c_buffer *buffer_info; | 531 | struct atl1c_buffer *buffer_info; |
532 | }; | 532 | }; |
533 | 533 | ||
534 | /* receive return desciptor (rrd) ring */ | 534 | /* receive return descriptor (rrd) ring */ |
535 | struct atl1c_rrd_ring { | 535 | struct atl1c_rrd_ring { |
536 | void *desc; /* descriptor ring virtual address */ | 536 | void *desc; /* descriptor ring virtual address */ |
537 | dma_addr_t dma; /* descriptor ring physical address */ | 537 | dma_addr_t dma; /* descriptor ring physical address */ |
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index 19905460def6..bfb6683a1443 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h | |||
@@ -843,7 +843,7 @@ struct gem_txd { | |||
843 | 843 | ||
844 | /* GEM requires that RX descriptors are provided four at a time, | 844 | /* GEM requires that RX descriptors are provided four at a time, |
845 | * aligned. Also, the RX ring may not wrap around. This means that | 845 | * aligned. Also, the RX ring may not wrap around. This means that |
846 | * there will be at least 4 unused desciptor entries in the middle | 846 | * there will be at least 4 unused descriptor entries in the middle |
847 | * of the RX ring at all times. | 847 | * of the RX ring at all times. |
848 | * | 848 | * |
849 | * Similar to HME, GEM assumes that it can write garbage bytes before | 849 | * Similar to HME, GEM assumes that it can write garbage bytes before |
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h index be5558ab84ea..95ee50385188 100644 --- a/drivers/scsi/aic7xxx/aic79xx.h +++ b/drivers/scsi/aic7xxx/aic79xx.h | |||
@@ -672,7 +672,7 @@ struct scb_data { | |||
672 | /************************ Target Mode Definitions *****************************/ | 672 | /************************ Target Mode Definitions *****************************/ |
673 | 673 | ||
674 | /* | 674 | /* |
675 | * Connection desciptor for select-in requests in target mode. | 675 | * Connection descriptor for select-in requests in target mode. |
676 | */ | 676 | */ |
677 | struct target_cmd { | 677 | struct target_cmd { |
678 | uint8_t scsiid; /* Our ID and the initiator's ID */ | 678 | uint8_t scsiid; /* Our ID and the initiator's ID */ |
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h index e4e651cca3e4..17444bc18bca 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.h +++ b/drivers/scsi/aic7xxx/aic7xxx.h | |||
@@ -618,7 +618,7 @@ struct scb_data { | |||
618 | /************************ Target Mode Definitions *****************************/ | 618 | /************************ Target Mode Definitions *****************************/ |
619 | 619 | ||
620 | /* | 620 | /* |
621 | * Connection desciptor for select-in requests in target mode. | 621 | * Connection descriptor for select-in requests in target mode. |
622 | */ | 622 | */ |
623 | struct target_cmd { | 623 | struct target_cmd { |
624 | uint8_t scsiid; /* Our ID and the initiator's ID */ | 624 | uint8_t scsiid; /* Our ID and the initiator's ID */ |
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c index a68ad7aa0b59..785772e66ed0 100644 --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c | |||
@@ -156,7 +156,7 @@ int wusbhc_rh_status_data(struct usb_hcd *usb_hcd, char *_buf) | |||
156 | EXPORT_SYMBOL_GPL(wusbhc_rh_status_data); | 156 | EXPORT_SYMBOL_GPL(wusbhc_rh_status_data); |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * Return the hub's desciptor | 159 | * Return the hub's descriptor |
160 | * | 160 | * |
161 | * NOTE: almost cut and paste from ehci-hub.c | 161 | * NOTE: almost cut and paste from ehci-hub.c |
162 | * | 162 | * |