aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/videobook.tmpl4
-rw-r--r--Documentation/input/ff.txt2
-rw-r--r--Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl2
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/scsi/FlashPoint.c2
-rw-r--r--include/asm-v850/ptrace.h2
-rw-r--r--include/linux/pfkeyv2.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/DocBook/videobook.tmpl b/Documentation/DocBook/videobook.tmpl
index 3ec6c875588a..fdff984a5161 100644
--- a/Documentation/DocBook/videobook.tmpl
+++ b/Documentation/DocBook/videobook.tmpl
@@ -229,7 +229,7 @@ int __init myradio_init(struct video_init *v)
229 229
230static int users = 0; 230static int users = 0;
231 231
232static int radio_open(stuct video_device *dev, int flags) 232static int radio_open(struct video_device *dev, int flags)
233{ 233{
234 if(users) 234 if(users)
235 return -EBUSY; 235 return -EBUSY;
@@ -949,7 +949,7 @@ int __init mycamera_init(struct video_init *v)
949 949
950static int users = 0; 950static int users = 0;
951 951
952static int camera_open(stuct video_device *dev, int flags) 952static int camera_open(struct video_device *dev, int flags)
953{ 953{
954 if(users) 954 if(users)
955 return -EBUSY; 955 return -EBUSY;
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt
index efa7dd6751f3..c7e10eaff203 100644
--- a/Documentation/input/ff.txt
+++ b/Documentation/input/ff.txt
@@ -120,7 +120,7 @@ to the unique id assigned by the driver. This data is required for performing
120some operations (removing an effect, controlling the playback). 120some operations (removing an effect, controlling the playback).
121This if field must be set to -1 by the user in order to tell the driver to 121This if field must be set to -1 by the user in order to tell the driver to
122allocate a new effect. 122allocate a new effect.
123See <linux/input.h> for a description of the ff_effect stuct. You should also 123See <linux/input.h> for a description of the ff_effect struct. You should also
124find help in a few sketches, contained in files shape.fig and interactive.fig. 124find help in a few sketches, contained in files shape.fig and interactive.fig.
125You need xfig to visualize these files. 125You need xfig to visualize these files.
126 126
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 4963d83d1511..e651ed8d1e6f 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -5577,7 +5577,7 @@ struct _snd_pcm_runtime {
5577 <informalexample> 5577 <informalexample>
5578 <programlisting> 5578 <programlisting>
5579<![CDATA[ 5579<![CDATA[
5580 static int mychip_suspend(strut pci_dev *pci, pm_message_t state) 5580 static int mychip_suspend(struct pci_dev *pci, pm_message_t state)
5581 { 5581 {
5582 /* (1) */ 5582 /* (1) */
5583 struct snd_card *card = pci_get_drvdata(pci); 5583 struct snd_card *card = pci_get_drvdata(pci);
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 2b948ea397d5..40926d779161 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -641,7 +641,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
641 spin_lock_irqsave(&sc->lmc_lock, flags); 641 spin_lock_irqsave(&sc->lmc_lock, flags);
642 642
643 if(sc->check != 0xBEAFCAFE){ 643 if(sc->check != 0xBEAFCAFE){
644 printk("LMC: Corrupt net_device stuct, breaking out\n"); 644 printk("LMC: Corrupt net_device struct, breaking out\n");
645 spin_unlock_irqrestore(&sc->lmc_lock, flags); 645 spin_unlock_irqrestore(&sc->lmc_lock, flags);
646 return; 646 return;
647 } 647 }
diff --git a/drivers/scsi/FlashPoint.c b/drivers/scsi/FlashPoint.c
index 5beed4f6d985..8d64f0bed628 100644
--- a/drivers/scsi/FlashPoint.c
+++ b/drivers/scsi/FlashPoint.c
@@ -149,7 +149,7 @@ typedef SCCBMGR_INFO * PSCCBMGR_INFO;
149#define PCI_BUS_CARD 0x03 149#define PCI_BUS_CARD 0x03
150#define VESA_BUS_CARD 0x04 150#define VESA_BUS_CARD 0x04
151 151
152/* SCCB struc used for both SCCB and UCB manager compiles! 152/* SCCB struct used for both SCCB and UCB manager compiles!
153 * The UCB Manager treats the SCCB as it's 'native hardware structure' 153 * The UCB Manager treats the SCCB as it's 'native hardware structure'
154 */ 154 */
155 155
diff --git a/include/asm-v850/ptrace.h b/include/asm-v850/ptrace.h
index 7bf72bb5078c..4f35cf2cd641 100644
--- a/include/asm-v850/ptrace.h
+++ b/include/asm-v850/ptrace.h
@@ -92,7 +92,7 @@ struct pt_regs
92/* The number of bytes used to store each register. */ 92/* The number of bytes used to store each register. */
93#define _PT_REG_SIZE 4 93#define _PT_REG_SIZE 4
94 94
95/* Offset of a general purpose register in a stuct pt_regs. */ 95/* Offset of a general purpose register in a struct pt_regs. */
96#define PT_GPR(num) ((num) * _PT_REG_SIZE) 96#define PT_GPR(num) ((num) * _PT_REG_SIZE)
97 97
98/* Offsets of various special registers & fields in a struct pt_regs. */ 98/* Offsets of various special registers & fields in a struct pt_regs. */
diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h
index 6351c4055ace..bac0fb389cf1 100644
--- a/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@ -104,7 +104,7 @@ struct sadb_prop {
104/* followed by: 104/* followed by:
105 struct sadb_comb sadb_combs[(sadb_prop_len + 105 struct sadb_comb sadb_combs[(sadb_prop_len +
106 sizeof(uint64_t) - sizeof(struct sadb_prop)) / 106 sizeof(uint64_t) - sizeof(struct sadb_prop)) /
107 sizeof(strut sadb_comb)]; */ 107 sizeof(struct sadb_comb)]; */
108 108
109struct sadb_comb { 109struct sadb_comb {
110 uint8_t sadb_comb_auth; 110 uint8_t sadb_comb_auth;