summaryrefslogtreecommitdiff
path: root/include/configs/RPXlite_DW.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/configs/RPXlite_DW.h')
-rw-r--r--include/configs/RPXlite_DW.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/RPXlite_DW.h b/include/configs/RPXlite_DW.h
index 6f23931cd8..5ff5c8514e 100644
--- a/include/configs/RPXlite_DW.h
+++ b/include/configs/RPXlite_DW.h
@@ -108,7 +108,7 @@
"lcd=setenv stdout lcd;setenv stdin lcd\0" \
"ser=setenv stdout serial;setenv stdin serial\0" \
"verify=no"
-
+
=======
"kernel_addr=ff080000\0" \
"ramdisk_addr=ff200000\0" \
@@ -209,7 +209,7 @@
<<<<<<< RPXlite_DW.h
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))
-
+
=======
#define CFG_RESET_ADDRESS ((ulong)((((immap_t *)CFG_IMMR)->im_clkrst.res)))