diff options
-rw-r--r-- | drivers/media/video/ov772x.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.seq | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.seq | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 | ||||
-rw-r--r-- | drivers/scsi/dc395x.c | 2 | ||||
-rw-r--r-- | include/linux/spi/spi_bitbang.h | 2 | ||||
-rw-r--r-- | kernel/time/clocksource.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c index eccb40ab7fec..205229333466 100644 --- a/drivers/media/video/ov772x.c +++ b/drivers/media/video/ov772x.c | |||
@@ -247,7 +247,7 @@ | |||
247 | 247 | ||
248 | /* COM5 */ | 248 | /* COM5 */ |
249 | #define AFR_ON_OFF 0x80 /* Auto frame rate control ON/OFF selection */ | 249 | #define AFR_ON_OFF 0x80 /* Auto frame rate control ON/OFF selection */ |
250 | #define AFR_SPPED 0x40 /* Auto frame rate control speed slection */ | 250 | #define AFR_SPPED 0x40 /* Auto frame rate control speed selection */ |
251 | /* Auto frame rate max rate control */ | 251 | /* Auto frame rate max rate control */ |
252 | #define AFR_NO_RATE 0x00 /* No reduction of frame rate */ | 252 | #define AFR_NO_RATE 0x00 /* No reduction of frame rate */ |
253 | #define AFR_1p2 0x10 /* Max reduction to 1/2 frame rate */ | 253 | #define AFR_1p2 0x10 /* Max reduction to 1/2 frame rate */ |
diff --git a/drivers/scsi/aic7xxx/aic79xx.seq b/drivers/scsi/aic7xxx/aic79xx.seq index 58bc17591b54..3b66b5ae3d9f 100644 --- a/drivers/scsi/aic7xxx/aic79xx.seq +++ b/drivers/scsi/aic7xxx/aic79xx.seq | |||
@@ -1281,7 +1281,7 @@ END_CRITICAL; | |||
1281 | * Is it a disconnect message? Set a flag in the SCB to remind us | 1281 | * Is it a disconnect message? Set a flag in the SCB to remind us |
1282 | * and await the bus going free. If this is an untagged transaction | 1282 | * and await the bus going free. If this is an untagged transaction |
1283 | * store the SCB id for it in our untagged target table for lookup on | 1283 | * store the SCB id for it in our untagged target table for lookup on |
1284 | * a reselction. | 1284 | * a reselection. |
1285 | */ | 1285 | */ |
1286 | mesgin_disconnect: | 1286 | mesgin_disconnect: |
1287 | /* | 1287 | /* |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 75b23317bd26..1222a7ac698a 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -2335,7 +2335,7 @@ ahd_linux_queue_abort_cmd(struct scsi_cmnd *cmd) | |||
2335 | /* | 2335 | /* |
2336 | * The sequencer will never re-reference the | 2336 | * The sequencer will never re-reference the |
2337 | * in-core SCB. To make sure we are notified | 2337 | * in-core SCB. To make sure we are notified |
2338 | * during reslection, set the MK_MESSAGE flag in | 2338 | * during reselection, set the MK_MESSAGE flag in |
2339 | * the card's copy of the SCB. | 2339 | * the card's copy of the SCB. |
2340 | */ | 2340 | */ |
2341 | ahd_outb(ahd, SCB_CONTROL, | 2341 | ahd_outb(ahd, SCB_CONTROL, |
diff --git a/drivers/scsi/aic7xxx/aic7xxx.seq b/drivers/scsi/aic7xxx/aic7xxx.seq index 15196390e28d..5a4cfc954a9f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx.seq +++ b/drivers/scsi/aic7xxx/aic7xxx.seq | |||
@@ -1693,7 +1693,7 @@ if ((ahc->flags & AHC_INITIATORROLE) != 0) { | |||
1693 | * Is it a disconnect message? Set a flag in the SCB to remind us | 1693 | * Is it a disconnect message? Set a flag in the SCB to remind us |
1694 | * and await the bus going free. If this is an untagged transaction | 1694 | * and await the bus going free. If this is an untagged transaction |
1695 | * store the SCB id for it in our untagged target table for lookup on | 1695 | * store the SCB id for it in our untagged target table for lookup on |
1696 | * a reselction. | 1696 | * a reselection. |
1697 | */ | 1697 | */ |
1698 | mesgin_disconnect: | 1698 | mesgin_disconnect: |
1699 | /* | 1699 | /* |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index fd2b9785ff4f..8cb05dc8e6a1 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -2290,7 +2290,7 @@ ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag) | |||
2290 | * In the non-paging case, the sequencer will | 2290 | * In the non-paging case, the sequencer will |
2291 | * never re-reference the in-core SCB. | 2291 | * never re-reference the in-core SCB. |
2292 | * To make sure we are notified during | 2292 | * To make sure we are notified during |
2293 | * reslection, set the MK_MESSAGE flag in | 2293 | * reselection, set the MK_MESSAGE flag in |
2294 | * the card's copy of the SCB. | 2294 | * the card's copy of the SCB. |
2295 | */ | 2295 | */ |
2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { | 2296 | if ((ahc->flags & AHC_PAGESCBS) == 0) { |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 075e2397273c..6c59c02c1ed9 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
@@ -1509,7 +1509,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb, | |||
1509 | * Try anyway? | 1509 | * Try anyway? |
1510 | * | 1510 | * |
1511 | * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection | 1511 | * We could, BUT: Sometimes the TRM_S1040 misses to produce a Selection |
1512 | * Timeout, a Disconnect or a Reselction IRQ, so we would be screwed! | 1512 | * Timeout, a Disconnect or a Reselection IRQ, so we would be screwed! |
1513 | * (This is likely to be a bug in the hardware. Obviously, most people | 1513 | * (This is likely to be a bug in the hardware. Obviously, most people |
1514 | * only have one initiator per SCSI bus.) | 1514 | * only have one initiator per SCSI bus.) |
1515 | * Instead let this fail and have the timer make sure the command is | 1515 | * Instead let this fail and have the timer make sure the command is |
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h index eed4254bd503..3274c507b8a9 100644 --- a/include/linux/spi/spi_bitbang.h +++ b/include/linux/spi/spi_bitbang.h | |||
@@ -15,7 +15,7 @@ | |||
15 | * Some hardware works well with requests at spi_transfer scope: | 15 | * Some hardware works well with requests at spi_transfer scope: |
16 | * | 16 | * |
17 | * - Drivers leveraging smarter hardware, with fifos or DMA; or for half | 17 | * - Drivers leveraging smarter hardware, with fifos or DMA; or for half |
18 | * duplex (MicroWire) controllers. Provide chipslect() and txrx_bufs(), | 18 | * duplex (MicroWire) controllers. Provide chipselect() and txrx_bufs(), |
19 | * and custom setup()/cleanup() methods. | 19 | * and custom setup()/cleanup() methods. |
20 | */ | 20 | */ |
21 | 21 | ||
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 5e18c6ab2c6a..c403567f78c0 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -580,7 +580,7 @@ sysfs_show_current_clocksources(struct sys_device *dev, | |||
580 | * @count: length of buffer | 580 | * @count: length of buffer |
581 | * | 581 | * |
582 | * Takes input from sysfs interface for manually overriding the default | 582 | * Takes input from sysfs interface for manually overriding the default |
583 | * clocksource selction. | 583 | * clocksource selection. |
584 | */ | 584 | */ |
585 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, | 585 | static ssize_t sysfs_override_clocksource(struct sys_device *dev, |
586 | struct sysdev_attribute *attr, | 586 | struct sysdev_attribute *attr, |
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 8ba306856d38..7b0446fa6009 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
@@ -947,7 +947,7 @@ static void init_input(struct hda_codec *codec) | |||
947 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ | 947 | coef |= 0x0500; /* DMIC2 enable 2 channels, disable GPIO1 */ |
948 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) | 948 | if (is_active_pin(codec, CS_DMIC1_PIN_NID)) |
949 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 | 949 | coef |= 0x1800; /* DMIC1 enable 2 channels, disable GPIO0 |
950 | * No effect if SPDIF_OUT2 is slected in | 950 | * No effect if SPDIF_OUT2 is selected in |
951 | * IDX_SPDIF_CTL. | 951 | * IDX_SPDIF_CTL. |
952 | */ | 952 | */ |
953 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | 953 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); |