Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / arch / m68k / platform / coldfire / head.S

diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/platform/coldfire/head.S
index 129bff4..6ae91a4 100644 (file)
--- a/arch/m68k/platform/coldfire/head.S
+++ b/arch/m68k/platform/coldfire/head.S
@@ -20,7 +20,7 @@
 
 /*
  *     If we don't have a fixed memory size, then lets build in code
- *     to auto detect the DRAM size. Obviously this is the prefered
+ *     to auto detect the DRAM size. Obviously this is the preferred
  *     method, and should work for most boards. It won't work for those
  *     that do not have their RAM starting at address 0, and it only
  *     works on SDRAM (not boards fitted with SRAM).