diff options
-rw-r--r-- | arch/mips/pci/fixup-fuloong2e.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 2 | ||||
-rw-r--r-- | net/irda/irnet/irnet_ppp.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/pci/fixup-fuloong2e.c b/arch/mips/pci/fixup-fuloong2e.c index 4f6d8da07f93..d5d4c018fb04 100644 --- a/arch/mips/pci/fixup-fuloong2e.c +++ b/arch/mips/pci/fixup-fuloong2e.c | |||
@@ -52,7 +52,7 @@ static void __init loongson2e_nec_fixup(struct pci_dev *pdev) | |||
52 | { | 52 | { |
53 | unsigned int val; | 53 | unsigned int val; |
54 | 54 | ||
55 | /* Configues port 1, 2, 3, 4 to be validate*/ | 55 | /* Configures port 1, 2, 3, 4 to be validate*/ |
56 | pci_read_config_dword(pdev, 0xe0, &val); | 56 | pci_read_config_dword(pdev, 0xe0, &val); |
57 | pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x4); | 57 | pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x4); |
58 | 58 | ||
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index e9d9d622a9b0..b7cb165d612b 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
@@ -2621,7 +2621,7 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id) | |||
2621 | iface = netdev_priv(dev); | 2621 | iface = netdev_priv(dev); |
2622 | local = iface->local; | 2622 | local = iface->local; |
2623 | 2623 | ||
2624 | /* Detect early interrupt before driver is fully configued */ | 2624 | /* Detect early interrupt before driver is fully configured */ |
2625 | spin_lock(&local->irq_init_lock); | 2625 | spin_lock(&local->irq_init_lock); |
2626 | if (!dev->base_addr) { | 2626 | if (!dev->base_addr) { |
2627 | if (net_ratelimit()) { | 2627 | if (net_ratelimit()) { |
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index dfe7b38dd4af..36f43cac8eab 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c | |||
@@ -663,7 +663,7 @@ dev_irnet_ioctl( | |||
663 | if((val == N_SYNC_PPP) || (val == N_PPP)) | 663 | if((val == N_SYNC_PPP) || (val == N_PPP)) |
664 | { | 664 | { |
665 | DEBUG(FS_INFO, "Entering PPP discipline.\n"); | 665 | DEBUG(FS_INFO, "Entering PPP discipline.\n"); |
666 | /* PPP channel setup (ap->chan in configued in dev_irnet_open())*/ | 666 | /* PPP channel setup (ap->chan in configured in dev_irnet_open())*/ |
667 | lock_kernel(); | 667 | lock_kernel(); |
668 | err = ppp_register_channel(&ap->chan); | 668 | err = ppp_register_channel(&ap->chan); |
669 | if(err == 0) | 669 | if(err == 0) |
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 209c25994c7e..4719558289d4 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c | |||
@@ -182,7 +182,7 @@ static int neo1973_gta02_voice_hw_params( | |||
182 | if (ret < 0) | 182 | if (ret < 0) |
183 | return ret; | 183 | return ret; |
184 | 184 | ||
185 | /* configue and enable PLL for 12.288MHz output */ | 185 | /* configure and enable PLL for 12.288MHz output */ |
186 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, | 186 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, |
187 | iis_clkrate / 4, 12288000); | 187 | iis_clkrate / 4, 12288000); |
188 | if (ret < 0) | 188 | if (ret < 0) |
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 0cb4f86f6d1e..4ac620988e7c 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -201,7 +201,7 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, | |||
201 | if (ret < 0) | 201 | if (ret < 0) |
202 | return ret; | 202 | return ret; |
203 | 203 | ||
204 | /* configue and enable PLL for 12.288MHz output */ | 204 | /* configure and enable PLL for 12.288MHz output */ |
205 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, | 205 | ret = snd_soc_dai_set_pll(codec_dai, WM8753_PLL2, 0, |
206 | iis_clkrate / 4, 12288000); | 206 | iis_clkrate / 4, 12288000); |
207 | if (ret < 0) | 207 | if (ret < 0) |