diff options
-rw-r--r-- | drivers/char/amiserial.c | 2 | ||||
-rw-r--r-- | drivers/media/video/hdpvr/hdpvr-video.c | 2 | ||||
-rw-r--r-- | drivers/net/b44.h | 2 | ||||
-rw-r--r-- | drivers/net/e100.c | 2 | ||||
-rw-r--r-- | drivers/net/niu.h | 4 | ||||
-rw-r--r-- | drivers/scsi/megaraid.h | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid/mbox_defs.h | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2870/common/mlme.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt3070/common/mlme.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/iop_wdt.c | 2 | ||||
-rw-r--r-- | sound/pci/aw2/aw2-saa7146.c | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index fd3ebd1be570..72429b6b2fa8 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
@@ -779,7 +779,7 @@ static void change_speed(struct async_struct *info, | |||
779 | info->IER |= UART_IER_MSI; | 779 | info->IER |= UART_IER_MSI; |
780 | } | 780 | } |
781 | /* TBD: | 781 | /* TBD: |
782 | * Does clearing IER_MSI imply that we should disbale the VBL interrupt ? | 782 | * Does clearing IER_MSI imply that we should disable the VBL interrupt ? |
783 | */ | 783 | */ |
784 | 784 | ||
785 | /* | 785 | /* |
diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c index 3e6ffee8dfed..ccd47f57f42c 100644 --- a/drivers/media/video/hdpvr/hdpvr-video.c +++ b/drivers/media/video/hdpvr/hdpvr-video.c | |||
@@ -181,7 +181,7 @@ static int hdpvr_submit_buffers(struct hdpvr_device *dev) | |||
181 | buff_list); | 181 | buff_list); |
182 | if (buf->status != BUFSTAT_AVAILABLE) { | 182 | if (buf->status != BUFSTAT_AVAILABLE) { |
183 | v4l2_err(&dev->v4l2_dev, | 183 | v4l2_err(&dev->v4l2_dev, |
184 | "buffer not marked as availbale\n"); | 184 | "buffer not marked as available\n"); |
185 | ret = -EFAULT; | 185 | ret = -EFAULT; |
186 | goto err; | 186 | goto err; |
187 | } | 187 | } |
diff --git a/drivers/net/b44.h b/drivers/net/b44.h index e678498de6db..d24158e7f309 100644 --- a/drivers/net/b44.h +++ b/drivers/net/b44.h | |||
@@ -97,7 +97,7 @@ | |||
97 | #define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */ | 97 | #define B44_DMARX_STAT 0x021CUL /* DMA RX Current Active Desc. + Status */ |
98 | #define DMARX_STAT_CDMASK 0x00000fff /* Current Descriptor Mask */ | 98 | #define DMARX_STAT_CDMASK 0x00000fff /* Current Descriptor Mask */ |
99 | #define DMARX_STAT_SMASK 0x0000f000 /* State Mask */ | 99 | #define DMARX_STAT_SMASK 0x0000f000 /* State Mask */ |
100 | #define DMARX_STAT_SDISABLED 0x00000000 /* State Disbaled */ | 100 | #define DMARX_STAT_SDISABLED 0x00000000 /* State Disabled */ |
101 | #define DMARX_STAT_SACTIVE 0x00001000 /* State Active */ | 101 | #define DMARX_STAT_SACTIVE 0x00001000 /* State Active */ |
102 | #define DMARX_STAT_SIDLE 0x00002000 /* State Idle Wait */ | 102 | #define DMARX_STAT_SIDLE 0x00002000 /* State Idle Wait */ |
103 | #define DMARX_STAT_SSTOPPED 0x00003000 /* State Stopped */ | 103 | #define DMARX_STAT_SSTOPPED 0x00003000 /* State Stopped */ |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 0f9ee1348552..af5364f49550 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2785,7 +2785,7 @@ static int e100_resume(struct pci_dev *pdev) | |||
2785 | /* ack any pending wake events, disable PME */ | 2785 | /* ack any pending wake events, disable PME */ |
2786 | pci_enable_wake(pdev, 0, 0); | 2786 | pci_enable_wake(pdev, 0, 0); |
2787 | 2787 | ||
2788 | /* disbale reverse auto-negotiation */ | 2788 | /* disable reverse auto-negotiation */ |
2789 | if (nic->phy == phy_82552_v) { | 2789 | if (nic->phy == phy_82552_v) { |
2790 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, | 2790 | u16 smartspeed = mdio_read(netdev, nic->mii.phy_id, |
2791 | E100_82552_SMARTSPEED); | 2791 | E100_82552_SMARTSPEED); |
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 8754e44cadae..3bd0b5933d59 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
@@ -3242,8 +3242,8 @@ struct niu { | |||
3242 | struct niu_parent *parent; | 3242 | struct niu_parent *parent; |
3243 | 3243 | ||
3244 | u32 flags; | 3244 | u32 flags; |
3245 | #define NIU_FLAGS_HOTPLUG_PHY_PRESENT 0x02000000 /* Removebale PHY detected*/ | 3245 | #define NIU_FLAGS_HOTPLUG_PHY_PRESENT 0x02000000 /* Removeable PHY detected*/ |
3246 | #define NIU_FLAGS_HOTPLUG_PHY 0x01000000 /* Removebale PHY */ | 3246 | #define NIU_FLAGS_HOTPLUG_PHY 0x01000000 /* Removeable PHY */ |
3247 | #define NIU_FLAGS_VPD_VALID 0x00800000 /* VPD has valid version */ | 3247 | #define NIU_FLAGS_VPD_VALID 0x00800000 /* VPD has valid version */ |
3248 | #define NIU_FLAGS_MSIX 0x00400000 /* MSI-X in use */ | 3248 | #define NIU_FLAGS_MSIX 0x00400000 /* MSI-X in use */ |
3249 | #define NIU_FLAGS_MCAST 0x00200000 /* multicast filter enabled */ | 3249 | #define NIU_FLAGS_MCAST 0x00200000 /* multicast filter enabled */ |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 795201fa0b48..512c2cc1a33f 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -469,7 +469,7 @@ typedef struct { | |||
469 | u8 type; /* Type of the device */ | 469 | u8 type; /* Type of the device */ |
470 | u8 cur_status; /* current status of the device */ | 470 | u8 cur_status; /* current status of the device */ |
471 | u8 tag_depth; /* Level of tagging */ | 471 | u8 tag_depth; /* Level of tagging */ |
472 | u8 sync_neg; /* sync negotiation - ENABLE or DISBALE */ | 472 | u8 sync_neg; /* sync negotiation - ENABLE or DISABLE */ |
473 | u32 size; /* configurable size in terms of 512 byte | 473 | u32 size; /* configurable size in terms of 512 byte |
474 | blocks */ | 474 | blocks */ |
475 | }__attribute__ ((packed)) phys_drv; | 475 | }__attribute__ ((packed)) phys_drv; |
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h index 170399ef06f4..b25b74764ec3 100644 --- a/drivers/scsi/megaraid/mbox_defs.h +++ b/drivers/scsi/megaraid/mbox_defs.h | |||
@@ -686,7 +686,7 @@ typedef struct { | |||
686 | * @type : Type of the device | 686 | * @type : Type of the device |
687 | * @cur_status : current status of the device | 687 | * @cur_status : current status of the device |
688 | * @tag_depth : Level of tagging | 688 | * @tag_depth : Level of tagging |
689 | * @sync_neg : sync negotiation - ENABLE or DISBALE | 689 | * @sync_neg : sync negotiation - ENABLE or DISABLE |
690 | * @size : configurable size in terms of 512 byte | 690 | * @size : configurable size in terms of 512 byte |
691 | */ | 691 | */ |
692 | typedef struct { | 692 | typedef struct { |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index c00f9ab9c46c..2edf2999f5c8 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -5664,7 +5664,7 @@ VOID AsicUpdateProtect( | |||
5664 | #if 0 | 5664 | #if 0 |
5665 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); | 5665 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); |
5666 | #else | 5666 | #else |
5667 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5667 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5668 | if (( | 5668 | if (( |
5669 | #ifdef DOT11_N_SUPPORT | 5669 | #ifdef DOT11_N_SUPPORT |
5670 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5670 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/staging/rt2870/common/mlme.c b/drivers/staging/rt2870/common/mlme.c index 8a82cee8bf26..a26bc033337d 100644 --- a/drivers/staging/rt2870/common/mlme.c +++ b/drivers/staging/rt2870/common/mlme.c | |||
@@ -5561,7 +5561,7 @@ VOID AsicUpdateProtect( | |||
5561 | #if 0 | 5561 | #if 0 |
5562 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); | 5562 | MacReg |= (pAd->CommonCfg.RtsThreshold << 8); |
5563 | #else | 5563 | #else |
5564 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5564 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5565 | if (( | 5565 | if (( |
5566 | #ifdef DOT11_N_SUPPORT | 5566 | #ifdef DOT11_N_SUPPORT |
5567 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5567 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/staging/rt3070/common/mlme.c b/drivers/staging/rt3070/common/mlme.c index 0ffbfa36699e..0189bab013cf 100644 --- a/drivers/staging/rt3070/common/mlme.c +++ b/drivers/staging/rt3070/common/mlme.c | |||
@@ -5575,7 +5575,7 @@ VOID AsicUpdateProtect( | |||
5575 | RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg); | 5575 | RTMP_IO_READ32(pAd, TX_RTS_CFG, &MacReg); |
5576 | MacReg &= 0xFF0000FF; | 5576 | MacReg &= 0xFF0000FF; |
5577 | 5577 | ||
5578 | // If the user want disable RtsThreshold and enbale Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 | 5578 | // If the user want disable RtsThreshold and enable Amsdu/Ralink-Aggregation, set the RtsThreshold as 4096 |
5579 | if (( | 5579 | if (( |
5580 | #ifdef DOT11_N_SUPPORT | 5580 | #ifdef DOT11_N_SUPPORT |
5581 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || | 5581 | (pAd->CommonCfg.BACapability.field.AmsduEnable) || |
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c index 96eb2cbe5874..0c9059676690 100644 --- a/drivers/watchdog/iop_wdt.c +++ b/drivers/watchdog/iop_wdt.c | |||
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file) | |||
192 | if (test_bit(WDT_ENABLED, &wdt_status)) | 192 | if (test_bit(WDT_ENABLED, &wdt_status)) |
193 | state = wdt_disable(); | 193 | state = wdt_disable(); |
194 | 194 | ||
195 | /* if the timer is not disbaled reload and notify that we are still | 195 | /* if the timer is not disabled reload and notify that we are still |
196 | * going down | 196 | * going down |
197 | */ | 197 | */ |
198 | if (state != 0) { | 198 | if (state != 0) { |
diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c index 6a3891ab69dd..296123ab74f7 100644 --- a/sound/pci/aw2/aw2-saa7146.c +++ b/sound/pci/aw2/aw2-saa7146.c | |||
@@ -108,7 +108,7 @@ void snd_aw2_saa7146_setup(struct snd_aw2_saa7146 *chip, | |||
108 | #endif | 108 | #endif |
109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ | 109 | /* WS0_CTRL, WS0_SYNC: input TSL1, I2S */ |
110 | 110 | ||
111 | /* At initialization WS1 and WS2 are disbaled (configured as input */ | 111 | /* At initialization WS1 and WS2 are disabled (configured as input) */ |
112 | acon1 |= 0 * WS1_CTRL; | 112 | acon1 |= 0 * WS1_CTRL; |
113 | acon1 |= 0 * WS2_CTRL; | 113 | acon1 |= 0 * WS2_CTRL; |
114 | 114 | ||