aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/mm/init_32.c2
-rw-r--r--drivers/char/serial167.c2
-rw-r--r--drivers/isdn/sc/hardware.h2
-rw-r--r--drivers/message/i2o/iop.c2
-rw-r--r--drivers/net/ks8851.c2
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c4
-rw-r--r--drivers/scsi/libfc/fc_fcp.c2
-rw-r--r--drivers/serial/samsung.c2
-rw-r--r--drivers/usb/serial/opticon.c2
-rw-r--r--drivers/usb/serial/symbolserial.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 4ec900af332f..b1dbd9ee87cc 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -47,7 +47,7 @@
47#include "mmu_decl.h" 47#include "mmu_decl.h"
48 48
49#if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL) 49#if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL)
50/* The ammount of lowmem must be within 0xF0000000 - KERNELBASE. */ 50/* The amount of lowmem must be within 0xF0000000 - KERNELBASE. */
51#if (CONFIG_LOWMEM_SIZE > (0xF0000000 - PAGE_OFFSET)) 51#if (CONFIG_LOWMEM_SIZE > (0xF0000000 - PAGE_OFFSET))
52#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_START_KERNEL" 52#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_START_KERNEL"
53#endif 53#endif
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 452370af95de..aee3c0d1759f 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1990,7 +1990,7 @@ void mvme167_serial_console_setup(int cflag)
1990 /* 1990 /*
1991 * Attempt to set up all channels to something reasonable, and 1991 * Attempt to set up all channels to something reasonable, and
1992 * bang out a INIT_CHAN command. We should then be able to limit 1992 * bang out a INIT_CHAN command. We should then be able to limit
1993 * the ammount of fiddling we have to do in normal running. 1993 * the amount of fiddling we have to do in normal running.
1994 */ 1994 */
1995 1995
1996 for (ch = 3; ch >= 0; ch--) { 1996 for (ch = 3; ch >= 0; ch--) {
diff --git a/drivers/isdn/sc/hardware.h b/drivers/isdn/sc/hardware.h
index 9e6d5302bf8e..627324856ead 100644
--- a/drivers/isdn/sc/hardware.h
+++ b/drivers/isdn/sc/hardware.h
@@ -87,7 +87,7 @@
87#define BRI_CHANNELS 2 /* Number of B channels */ 87#define BRI_CHANNELS 2 /* Number of B channels */
88#define BRI_BASEPG_VAL 0x98 88#define BRI_BASEPG_VAL 0x98
89#define BRI_MAGIC 0x60000 /* Magic Number */ 89#define BRI_MAGIC 0x60000 /* Magic Number */
90#define BRI_MEMSIZE 0x10000 /* Ammount of RAM (64K) */ 90#define BRI_MEMSIZE 0x10000 /* Amount of RAM (64K) */
91#define BRI_PARTNO "72-029" 91#define BRI_PARTNO "72-029"
92#define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS; 92#define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS;
93/* 93/*
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index e5ab62141503..ef5ce2676f05 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -539,7 +539,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
539 * which is indeterminate. We need to wait until the IOP has 539 * which is indeterminate. We need to wait until the IOP has
540 * rebooted before we can let the system talk to it. We read 540 * rebooted before we can let the system talk to it. We read
541 * the inbound Free_List until a message is available. If we 541 * the inbound Free_List until a message is available. If we
542 * can't read one in the given ammount of time, we assume the 542 * can't read one in the given amount of time, we assume the
543 * IOP could not reboot properly. 543 * IOP could not reboot properly.
544 */ 544 */
545 osm_debug("%s: Reset in progress, waiting for reboot...\n", 545 osm_debug("%s: Reset in progress, waiting for reboot...\n",
diff --git a/drivers/net/ks8851.c b/drivers/net/ks8851.c
index 6d3ac65bc35c..cfebe0e218fc 100644
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
@@ -407,7 +407,7 @@ static irqreturn_t ks8851_irq(int irq, void *pw)
407 * @buff: The buffer address 407 * @buff: The buffer address
408 * @len: The length of the data to read 408 * @len: The length of the data to read
409 * 409 *
410 * Issue an RXQ FIFO read command and read the @len ammount of data from 410 * Issue an RXQ FIFO read command and read the @len amount of data from
411 * the FIFO into the buffer specified by @buff. 411 * the FIFO into the buffer specified by @buff.
412 */ 412 */
413static void ks8851_rdfifo(struct ks8851_net *ks, u8 *buff, unsigned len) 413static void ks8851_rdfifo(struct ks8851_net *ks, u8 *buff, unsigned len)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index e67e4feb35cb..215621c31c5f 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -1667,7 +1667,7 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv)
1667 * Table of recommended minimum BIOS versions 1667 * Table of recommended minimum BIOS versions
1668 * 1668 *
1669 * Reasons for listing: 1669 * Reasons for listing:
1670 * 1. Stable BIOS, listed because the unknown ammount of 1670 * 1. Stable BIOS, listed because the unknown amount of
1671 * bugs and bad ACPI behaviour on older versions 1671 * bugs and bad ACPI behaviour on older versions
1672 * 1672 *
1673 * 2. BIOS or EC fw with known bugs that trigger on Linux 1673 * 2. BIOS or EC fw with known bugs that trigger on Linux
@@ -7070,7 +7070,7 @@ static struct ibm_struct volume_driver_data = {
7070 * 7070 *
7071 * Fan speed changes of any sort (including those caused by the 7071 * Fan speed changes of any sort (including those caused by the
7072 * disengaged mode) are usually done slowly by the firmware as the 7072 * disengaged mode) are usually done slowly by the firmware as the
7073 * maximum ammount of fan duty cycle change per second seems to be 7073 * maximum amount of fan duty cycle change per second seems to be
7074 * limited. 7074 * limited.
7075 * 7075 *
7076 * Reading is not available if GFAN exists. 7076 * Reading is not available if GFAN exists.
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 881d5dfe8c74..96ee599d9a05 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -522,7 +522,7 @@ crc_err:
522 * 522 *
523 * Called after receiving a Transfer Ready data descriptor. 523 * Called after receiving a Transfer Ready data descriptor.
524 * If the LLD is capable of sequence offload then send down the 524 * If the LLD is capable of sequence offload then send down the
525 * seq_blen ammount of data in single frame, otherwise send 525 * seq_blen amount of data in single frame, otherwise send
526 * multiple frames of the maximum frame payload supported by 526 * multiple frames of the maximum frame payload supported by
527 * the target port. 527 * the target port.
528 */ 528 */
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 52e3df113ec0..03c010af966b 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -1271,7 +1271,7 @@ s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
1271 unsigned long ufstat, utrstat; 1271 unsigned long ufstat, utrstat;
1272 1272
1273 if (ufcon & S3C2410_UFCON_FIFOMODE) { 1273 if (ufcon & S3C2410_UFCON_FIFOMODE) {
1274 /* fifo mode - check ammount of data in fifo registers... */ 1274 /* fifo mode - check amount of data in fifo registers... */
1275 1275
1276 ufstat = rd_regl(port, S3C2410_UFSTAT); 1276 ufstat = rd_regl(port, S3C2410_UFSTAT);
1277 return (ufstat & info->tx_fifofull) ? 0 : 1; 1277 return (ufstat & info->tx_fifofull) ? 0 : 1;
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 4cdb975caa89..96937f1b8b97 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -120,7 +120,7 @@ static void opticon_bulk_callback(struct urb *urb)
120 } 120 }
121 } else { 121 } else {
122 dev_dbg(&priv->udev->dev, 122 dev_dbg(&priv->udev->dev,
123 "Improper ammount of data received from the device, " 123 "Improper amount of data received from the device, "
124 "%d bytes", urb->actual_length); 124 "%d bytes", urb->actual_length);
125 } 125 }
126 126
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index b282c0f2d8e5..aebfcf699644 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -100,7 +100,7 @@ static void symbol_int_callback(struct urb *urb)
100 } 100 }
101 } else { 101 } else {
102 dev_dbg(&priv->udev->dev, 102 dev_dbg(&priv->udev->dev,
103 "Improper ammount of data received from the device, " 103 "Improper amount of data received from the device, "
104 "%d bytes", urb->actual_length); 104 "%d bytes", urb->actual_length);
105 } 105 }
106 106