aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap1/board-perseus2.c2
-rw-r--r--drivers/cdrom/cm206.c2
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c2
-rw-r--r--drivers/parisc/led.c2
-rw-r--r--drivers/usb/serial/usb-serial.c2
-rw-r--r--net/ipv4/netfilter/ip_conntrack_proto_tcp.c4
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c4
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index bd900b7ab33c..92ff5dc07351 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -184,7 +184,7 @@ static void __init omap_perseus2_map_io(void)
184 omap_writel(0x00000088, OMAP730_FLASH_ACFG_0); 184 omap_writel(0x00000088, OMAP730_FLASH_ACFG_0);
185 185
186 /* 186 /*
187 * Ethernet support trough the debug board 187 * Ethernet support through the debug board
188 * CS1 timings setup 188 * CS1 timings setup
189 */ 189 */
190 omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1); 190 omap_writel(0x0000fff3, OMAP730_FLASH_CFG_1);
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 01f035173328..ce127f7ec0f6 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -32,7 +32,7 @@ History:
32 18 mrt 1995: 0.24 Working background read-ahead. (still problems) 32 18 mrt 1995: 0.24 Working background read-ahead. (still problems)
33 26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2). 33 26 mrt 1995: 0.25 Multi-session ioctl added (kernel v1.2).
34 Statistics implemented, though separate stats206.h. 34 Statistics implemented, though separate stats206.h.
35 Accessible trough ioctl 0x1000 (just a number). 35 Accessible through ioctl 0x1000 (just a number).
36 Hard to choose between v1.2 development and 1.1.75. 36 Hard to choose between v1.2 development and 1.1.75.
37 Bottom-half doesn't work with 1.2... 37 Bottom-half doesn't work with 1.2...
38 0.25a: fixed... typo. Still problems... 38 0.25a: fixed... typo. Still problems...
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 049c34b37067..593d8adee891 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1598,7 +1598,7 @@ do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
1598 switch(cmd) { 1598 switch(cmd) {
1599 case SIOCGMIIPHY: /* Get the address of the PHY in use. */ 1599 case SIOCGMIIPHY: /* Get the address of the PHY in use. */
1600 data[0] = 0; /* we have only this address */ 1600 data[0] = 0; /* we have only this address */
1601 /* fall trough */ 1601 /* fall through */
1602 case SIOCGMIIREG: /* Read the specified MII register. */ 1602 case SIOCGMIIREG: /* Read the specified MII register. */
1603 data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f); 1603 data[3] = mii_rd(ioaddr, data[0] & 0x1f, data[1] & 0x1f);
1604 break; 1604 break;
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 95bd07b8b61b..315be4770d3e 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -347,7 +347,7 @@ static void led_LCD_driver(unsigned char leds)
347 ** 347 **
348 ** led_get_net_activity() 348 ** led_get_net_activity()
349 ** 349 **
350 ** calculate if there was TX- or RX-troughput on the network interfaces 350 ** calculate if there was TX- or RX-throughput on the network interfaces
351 ** (analog to dev_get_info() from net/core/dev.c) 351 ** (analog to dev_get_info() from net/core/dev.c)
352 ** 352 **
353 */ 353 */
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8bc8337c99c4..4dd6865d32b0 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -584,7 +584,7 @@ static struct usb_serial_driver *search_serial_device(struct usb_interface *ifac
584 const struct usb_device_id *id; 584 const struct usb_device_id *id;
585 struct usb_serial_driver *t; 585 struct usb_serial_driver *t;
586 586
587 /* List trough know devices and see if the usb id matches */ 587 /* Check if the usb id matches a known device */
588 list_for_each(p, &usb_serial_driver_list) { 588 list_for_each(p, &usb_serial_driver_list) {
589 t = list_entry(p, struct usb_serial_driver, driver_list); 589 t = list_entry(p, struct usb_serial_driver, driver_list);
590 id = usb_match_id(iface, t->id_table); 590 id = usb_match_id(iface, t->id_table);
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index e7fa29e576dc..77f304680d86 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -995,7 +995,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
995 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) 995 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
996 && conntrack->proto.tcp.last_index == TCP_ACK_SET)) 996 && conntrack->proto.tcp.last_index == TCP_ACK_SET))
997 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { 997 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) {
998 /* RST sent to invalid SYN or ACK we had let trough 998 /* RST sent to invalid SYN or ACK we had let through
999 * at a) and c) above: 999 * at a) and c) above:
1000 * 1000 *
1001 * a) SYN was in window then 1001 * a) SYN was in window then
@@ -1006,7 +1006,7 @@ static int tcp_packet(struct ip_conntrack *conntrack,
1006 * segments we ignored. */ 1006 * segments we ignored. */
1007 goto in_window; 1007 goto in_window;
1008 } 1008 }
1009 /* Just fall trough */ 1009 /* Just fall through */
1010 default: 1010 default:
1011 /* Keep compilers happy. */ 1011 /* Keep compilers happy. */
1012 break; 1012 break;
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 6167137a5cb5..9a1348a51a0d 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -988,7 +988,7 @@ static int tcp_packet(struct nf_conn *conntrack,
988 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status) 988 || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
989 && conntrack->proto.tcp.last_index == TCP_ACK_SET)) 989 && conntrack->proto.tcp.last_index == TCP_ACK_SET))
990 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) { 990 && ntohl(th->ack_seq) == conntrack->proto.tcp.last_end) {
991 /* RST sent to invalid SYN or ACK we had let trough 991 /* RST sent to invalid SYN or ACK we had let through
992 * at a) and c) above: 992 * at a) and c) above:
993 * 993 *
994 * a) SYN was in window then 994 * a) SYN was in window then
@@ -999,7 +999,7 @@ static int tcp_packet(struct nf_conn *conntrack,
999 * segments we ignored. */ 999 * segments we ignored. */
1000 goto in_window; 1000 goto in_window;
1001 } 1001 }
1002 /* Just fall trough */ 1002 /* Just fall through */
1003 default: 1003 default:
1004 /* Keep compilers happy. */ 1004 /* Keep compilers happy. */
1005 break; 1005 break;
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index 09cb250d5827..962e6d525564 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -209,7 +209,7 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)
209 case SNDRV_PCM_FORMAT_S24_3LE: 209 case SNDRV_PCM_FORMAT_S24_3LE:
210 case SNDRV_PCM_FORMAT_S24_3BE: 210 case SNDRV_PCM_FORMAT_S24_3BE:
211 chip->pcm_sample = 3; 211 chip->pcm_sample = 3;
212 /* fall trough */ 212 /* fall through */
213 default: /* 24-bit */ 213 default: /* 24-bit */
214 aval = AK4117_DIF_24R; 214 aval = AK4117_DIF_24R;
215 chip->pcm_frame = 3; 215 chip->pcm_frame = 3;