Merge git://git.denx.de/u-boot-x86

[u-boot] / arch / arm / include / asm / memory.h

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 1864ab9fb55ec18d2a3be8da88722f93d19ede58..6b460786e008638dfde3a77f095e0a18fe57b977 100644 (file)
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -45,7 +45,7 @@ static inline void *phys_to_virt(unsigned long x)
 /*
  * Virtual <-> DMA view memory address translations
  * Again, these are *only* valid on the kernel direct mapped RAM
- * memory.  Use of these is *depreciated*.
+ * memory.  Use of these is *deprecated*.
  */
 #define virt_to_bus(x)         (__virt_to_bus((unsigned long)(x)))
 #define bus_to_virt(x)         ((void *)(__bus_to_virt((unsigned long)(x))))
@@ -127,7 +127,7 @@ static inline void *phys_to_virt(unsigned long x)
 #endif
 
 /*
- * We should really eliminate virt_to_bus() here - it's depreciated.
+ * We should really eliminate virt_to_bus() here - it's deprecated.
  */
 #define page_to_bus(page)      (virt_to_bus(page_address(page)))