diff options
-rw-r--r-- | Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 2 | ||||
-rw-r--r-- | arch/m68k/bvme6000/config.c | 2 | ||||
-rw-r--r-- | arch/s390/crypto/crypt_s390_query.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_core.c | 2 | ||||
-rw-r--r-- | drivers/net/sis900.c | 4 | ||||
-rw-r--r-- | include/linux/gameport.h | 4 | ||||
-rw-r--r-- | include/linux/serio.h | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 6dc9d9f622ca..6feef9e82b63 100644 --- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl | |||
@@ -2836,7 +2836,7 @@ struct _snd_pcm_runtime { | |||
2836 | 2836 | ||
2837 | <para> | 2837 | <para> |
2838 | Note that this callback became non-atomic since the recent version. | 2838 | Note that this callback became non-atomic since the recent version. |
2839 | You can use schedule-related fucntions safely in this callback now. | 2839 | You can use schedule-related functions safely in this callback now. |
2840 | </para> | 2840 | </para> |
2841 | 2841 | ||
2842 | <para> | 2842 | <para> |
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 3ffc84f9c291..c90cb5fcc8ef 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c | |||
@@ -142,7 +142,7 @@ void __init config_bvme6000(void) | |||
142 | /* Now do the PIT configuration */ | 142 | /* Now do the PIT configuration */ |
143 | 143 | ||
144 | pit->pgcr = 0x00; /* Unidirectional 8 bit, no handshake for now */ | 144 | pit->pgcr = 0x00; /* Unidirectional 8 bit, no handshake for now */ |
145 | pit->psrr = 0x18; /* PIACK and PIRQ fucntions enabled */ | 145 | pit->psrr = 0x18; /* PIACK and PIRQ functions enabled */ |
146 | pit->pacr = 0x00; /* Sub Mode 00, H2 i/p, no DMA */ | 146 | pit->pacr = 0x00; /* Sub Mode 00, H2 i/p, no DMA */ |
147 | pit->padr = 0x00; /* Just to be tidy! */ | 147 | pit->padr = 0x00; /* Just to be tidy! */ |
148 | pit->paddr = 0x00; /* All inputs for now (safest) */ | 148 | pit->paddr = 0x00; /* All inputs for now (safest) */ |
diff --git a/arch/s390/crypto/crypt_s390_query.c b/arch/s390/crypto/crypt_s390_query.c index def02bdc44a4..54fb11d7fadd 100644 --- a/arch/s390/crypto/crypt_s390_query.c +++ b/arch/s390/crypto/crypt_s390_query.c | |||
@@ -55,7 +55,7 @@ static void query_available_functions(void) | |||
55 | printk(KERN_INFO "KMC_AES_256: %d\n", | 55 | printk(KERN_INFO "KMC_AES_256: %d\n", |
56 | crypt_s390_func_available(KMC_AES_256_ENCRYPT)); | 56 | crypt_s390_func_available(KMC_AES_256_ENCRYPT)); |
57 | 57 | ||
58 | /* query available KIMD fucntions */ | 58 | /* query available KIMD functions */ |
59 | printk(KERN_INFO "KIMD_QUERY: %d\n", | 59 | printk(KERN_INFO "KIMD_QUERY: %d\n", |
60 | crypt_s390_func_available(KIMD_QUERY)); | 60 | crypt_s390_func_available(KIMD_QUERY)); |
61 | printk(KERN_INFO "KIMD_SHA_1: %d\n", | 61 | printk(KERN_INFO "KIMD_SHA_1: %d\n", |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 99a3a28594da..713b763884a9 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -246,7 +246,7 @@ static int acpi_processor_errata(struct acpi_processor *pr) | |||
246 | } | 246 | } |
247 | 247 | ||
248 | /* -------------------------------------------------------------------------- | 248 | /* -------------------------------------------------------------------------- |
249 | Common ACPI processor fucntions | 249 | Common ACPI processor functions |
250 | -------------------------------------------------------------------------- */ | 250 | -------------------------------------------------------------------------- */ |
251 | 251 | ||
252 | /* | 252 | /* |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 253440a98022..8429ceb01389 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1693,7 +1693,7 @@ static irqreturn_t sis900_interrupt(int irq, void *dev_instance, struct pt_regs | |||
1693 | * | 1693 | * |
1694 | * Process receive interrupt events, | 1694 | * Process receive interrupt events, |
1695 | * put buffer to higher layer and refill buffer pool | 1695 | * put buffer to higher layer and refill buffer pool |
1696 | * Note: This fucntion is called by interrupt handler, | 1696 | * Note: This function is called by interrupt handler, |
1697 | * don't do "too much" work here | 1697 | * don't do "too much" work here |
1698 | */ | 1698 | */ |
1699 | 1699 | ||
@@ -1840,7 +1840,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1840 | * | 1840 | * |
1841 | * Check for error condition and free socket buffer etc | 1841 | * Check for error condition and free socket buffer etc |
1842 | * schedule for more transmission as needed | 1842 | * schedule for more transmission as needed |
1843 | * Note: This fucntion is called by interrupt handler, | 1843 | * Note: This function is called by interrupt handler, |
1844 | * don't do "too much" work here | 1844 | * don't do "too much" work here |
1845 | */ | 1845 | */ |
1846 | 1846 | ||
diff --git a/include/linux/gameport.h b/include/linux/gameport.h index 2401dea2b867..9c8e6da2393b 100644 --- a/include/linux/gameport.h +++ b/include/linux/gameport.h | |||
@@ -119,7 +119,7 @@ static inline void gameport_set_name(struct gameport *gameport, const char *name | |||
119 | } | 119 | } |
120 | 120 | ||
121 | /* | 121 | /* |
122 | * Use the following fucntions to manipulate gameport's per-port | 122 | * Use the following functions to manipulate gameport's per-port |
123 | * driver-specific data. | 123 | * driver-specific data. |
124 | */ | 124 | */ |
125 | static inline void *gameport_get_drvdata(struct gameport *gameport) | 125 | static inline void *gameport_get_drvdata(struct gameport *gameport) |
@@ -133,7 +133,7 @@ static inline void gameport_set_drvdata(struct gameport *gameport, void *data) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * Use the following fucntions to pin gameport's driver in process context | 136 | * Use the following functions to pin gameport's driver in process context |
137 | */ | 137 | */ |
138 | static inline int gameport_pin_driver(struct gameport *gameport) | 138 | static inline int gameport_pin_driver(struct gameport *gameport) |
139 | { | 139 | { |
diff --git a/include/linux/serio.h b/include/linux/serio.h index aa4d6493a034..690aabca8ed0 100644 --- a/include/linux/serio.h +++ b/include/linux/serio.h | |||
@@ -119,7 +119,7 @@ static inline void serio_cleanup(struct serio *serio) | |||
119 | } | 119 | } |
120 | 120 | ||
121 | /* | 121 | /* |
122 | * Use the following fucntions to manipulate serio's per-port | 122 | * Use the following functions to manipulate serio's per-port |
123 | * driver-specific data. | 123 | * driver-specific data. |
124 | */ | 124 | */ |
125 | static inline void *serio_get_drvdata(struct serio *serio) | 125 | static inline void *serio_get_drvdata(struct serio *serio) |
@@ -133,7 +133,7 @@ static inline void serio_set_drvdata(struct serio *serio, void *data) | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * Use the following fucntions to protect critical sections in | 136 | * Use the following functions to protect critical sections in |
137 | * driver code from port's interrupt handler | 137 | * driver code from port's interrupt handler |
138 | */ | 138 | */ |
139 | static inline void serio_pause_rx(struct serio *serio) | 139 | static inline void serio_pause_rx(struct serio *serio) |
@@ -147,7 +147,7 @@ static inline void serio_continue_rx(struct serio *serio) | |||
147 | } | 147 | } |
148 | 148 | ||
149 | /* | 149 | /* |
150 | * Use the following fucntions to pin serio's driver in process context | 150 | * Use the following functions to pin serio's driver in process context |
151 | */ | 151 | */ |
152 | static inline int serio_pin_driver(struct serio *serio) | 152 | static inline int serio_pin_driver(struct serio *serio) |
153 | { | 153 | { |