summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/cpu/arm920t/at91rm9200/ether.c2
-rw-r--r--arch/sparc/cpu/leon2/cpu_init.c4
-rw-r--r--arch/sparc/cpu/leon3/cpu_init.c4
-rw-r--r--common/cmd_usb.c2
-rw-r--r--common/usb_storage.c2
-rw-r--r--drivers/net/at91_emac.c2
-rw-r--r--fs/jffs2/jffs2_1pass.c2
-rw-r--r--fs/jffs2/jffs2_nand_1pass.c2
8 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/cpu/arm920t/at91rm9200/ether.c b/arch/arm/cpu/arm920t/at91rm9200/ether.c
index e1cdebab9d8..d7135c57d5d 100644
--- a/arch/arm/cpu/arm920t/at91rm9200/ether.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/ether.c
@@ -39,7 +39,7 @@ typedef struct {
#define RBF_MULTICAST (1<<30)
#define RBF_UNICAST (1<<29)
#define RBF_EXTERNAL (1<<28)
-#define RBF_UNKOWN (1<<27)
+#define RBF_UNKNOWN (1<<27)
#define RBF_SIZE 0x07ff
#define RBF_LOCAL4 (1<<26)
#define RBF_LOCAL3 (1<<25)
diff --git a/arch/sparc/cpu/leon2/cpu_init.c b/arch/sparc/cpu/leon2/cpu_init.c
index a24f778c6d7..795c7d7a79c 100644
--- a/arch/sparc/cpu/leon2/cpu_init.c
+++ b/arch/sparc/cpu/leon2/cpu_init.c
@@ -47,9 +47,9 @@ struct {
* initialize a bunch of registers.
*
* Run from FLASH/PROM:
- * - until memory controller is set up, only registers avaiable
+ * - until memory controller is set up, only registers available
* - no global variables available for writing
- * - constants avaiable
+ * - constants available
*/
void cpu_init_f(void)
diff --git a/arch/sparc/cpu/leon3/cpu_init.c b/arch/sparc/cpu/leon3/cpu_init.c
index be22ec26aaf..cba9d0eb40b 100644
--- a/arch/sparc/cpu/leon3/cpu_init.c
+++ b/arch/sparc/cpu/leon3/cpu_init.c
@@ -57,9 +57,9 @@ struct {
* initialize a bunch of registers.
*
* Run from FLASH/PROM:
- * - until memory controller is set up, only registers avaiable
+ * - until memory controller is set up, only registers available
* - no global variables available for writing
- * - constants avaiable
+ * - constants available
*/
void cpu_init_f(void)
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index b5731a7bb8d..3ba6fff4fd3 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -588,7 +588,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
break;
}
if (dev == NULL) {
- printf("*** NO Device avaiable ***\n");
+ printf("*** No device available ***\n");
return 0;
} else {
usb_display_desc(dev);
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 6963e6dcc89..9ecf165d1af 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -254,7 +254,7 @@ int usb_stor_scan(int mode)
dev = usb_get_dev_index(i); /* get device */
USB_STOR_PRINTF("i=%d\n", i);
if (dev == NULL)
- break; /* no more devices avaiable */
+ break; /* no more devices available */
if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
/* OK, it's a storage device. Iterate over its LUNs
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 4e5685c0c32..90eb5152409 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -93,7 +93,7 @@
#define RBF_MULTICAST (1<<30)
#define RBF_UNICAST (1<<29)
#define RBF_EXTERNAL (1<<28)
-#define RBF_UNKOWN (1<<27)
+#define RBF_UNKNOWN (1<<27)
#define RBF_SIZE 0x07ff
#define RBF_LOCAL4 (1<<26)
#define RBF_LOCAL3 (1<<25)
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index c4f7445221d..5ddc2b93710 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -794,7 +794,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest)
#endif
default:
/* unknown */
- putLabeledWord("UNKOWN COMPRESSION METHOD = ", jNode->compr);
+ putLabeledWord("UNKNOWN COMPRESSION METHOD = ", jNode->compr);
put_fl_mem(jNode, pL->readbuf);
return -1;
break;
diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c
index 3982003a421..740f787dd23 100644
--- a/fs/jffs2/jffs2_nand_1pass.c
+++ b/fs/jffs2/jffs2_nand_1pass.c
@@ -350,7 +350,7 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest,
#endif
default:
/* unknown */
- putLabeledWord("UNKOWN COMPRESSION METHOD = ", inode->compr);
+ putLabeledWord("UNKNOWN COMPRESSION METHOD = ", inode->compr);
return -1;
}
}