From 77f5c34af0e4e2c114476759e3971decfdf27f01 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 16 Aug 2015 11:00:30 -0600 Subject: [PATCH] Fix some common typos --- ChangeLog | 4 ++-- arch | 2 +- configs | 2 +- drivers/net/e1000.c | 4 ++-- drivers/usbdev/usbmsc_scsi.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a364185ded..1812628b4d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5333,7 +5333,7 @@ * arch/arm/src/sama5/sam_memories.c and .h: Centralize logic for conversions between physical and virtual addresses (2013-8-9). * arch/arm/src/sama5/sam_hsmci.c and sam34/sam_hsmci.c: Correct a - race condition in the SAMA5 HSCMI driver: The tranfer done + race condition in the SAMA5 HSCMI driver: The transfer done interrupt was firing before the wait was started. Fix this and also backported the changes to SAM3/4 (untested). Now HSCMI is functional on the SAMA5 with DMA! (2013-8-10). @@ -10383,7 +10383,7 @@ corrected implementation of pthread_kill() will direct the signal specifically to the specific pthread and no other (2015-05-13). * arch/arm/include/samdl, arch/arm/src/samdl, configs/samd20-xplained: - Rename the samd/ directories and configuratino varialbes to samdl to + Rename the samd/ directories and configuration varialbes to samdl to all the same directory structure to support the SAML21 (2015-05-14). * arch/arm/include/samdl and arch/arm/src/samdl: And chip definitions, configuration framework, and placeholder memory map and pin diff --git a/arch b/arch index b1ae87d1e9..97e57f60e9 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit b1ae87d1e95d2c3593d87e2e6d292979bfdd68aa +Subproject commit 97e57f60e929eb6e7be76edcfad4f67e8714ef25 diff --git a/configs b/configs index d22ff0b3ff..24588fc10a 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit d22ff0b3ff36cd5e324538b74b8064edaa3b63d8 +Subproject commit 24588fc10ae08f68c7dead477a7ad625b028679e diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index b122b75d98..38b0f15ee2 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1128,8 +1128,8 @@ static int e1000_probe(uint16_t addr, pci_id_t id) * access performance. The page size alloc will restrict * this bad effect only within the memory we alloc here. * - * NEED FIX: the memalign may alloc memory continous in - * virtual address but dis-continous in physical address + * NEED FIX: the memalign may alloc memory continuous in + * virtual address but dis-continuous in physical address * due to RGMP memory setup. */ diff --git a/drivers/usbdev/usbmsc_scsi.c b/drivers/usbdev/usbmsc_scsi.c index fd8a5340ae..97b489b523 100644 --- a/drivers/usbdev/usbmsc_scsi.c +++ b/drivers/usbdev/usbmsc_scsi.c @@ -2281,7 +2281,7 @@ static int usbmsc_cmdwritestate(FAR struct usbmsc_dev_s *priv) xfrd = req->xfrd; priv->nreqbytes = xfrd; - /* Now loop until all of the data in the read request has been tranferred + /* Now loop until all of the data in the read request has been transferred * to the block driver OR all of the request data has been transferred. */