summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
committerWolfgang Denk <wd@denx.de>2010-03-21 22:45:36 +0100
commitb46b353b901a45ebe860f8bf874ca99f018cd410 (patch)
treee2d42c0f36b9d7b67c1a17fe97f4734552370a6b /include
parent3c950e2ebfde083084cc926b020e3a22a536bf85 (diff)
parentdaa989b47297c9f73426783599c286ef3a1f3f49 (diff)
downloadu-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.zip
u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.gz
u-boot-imx-b46b353b901a45ebe860f8bf874ca99f018cd410.tar.bz2
Merge remote branch 'origin/master' into next
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-at91/at91_matrix.h2
-rw-r--r--[-rwxr-xr-x]include/asm-arm/arch-spear/spr_gpt.h0
-rw-r--r--[-rwxr-xr-x]include/asm-arm/arch-spear/spr_i2c.h0
-rw-r--r--[-rwxr-xr-x]include/asm-arm/arch-spear/spr_smi.h0
-rw-r--r--[-rwxr-xr-x]include/asm-arm/arch-spear/spr_xloader_table.h0
-rw-r--r--[-rwxr-xr-x]include/configs/spear3xx.h0
-rw-r--r--[-rwxr-xr-x]include/configs/spear6xx.h0
-rw-r--r--[-rwxr-xr-x]include/usb/spr_udc.h0
8 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-at91/at91_matrix.h b/include/asm-arm/arch-at91/at91_matrix.h
index 9b3c110..981ec20 100644
--- a/include/asm-arm/arch-at91/at91_matrix.h
+++ b/include/asm-arm/arch-at91/at91_matrix.h
@@ -80,7 +80,7 @@ typedef struct at91_matrix {
u32 mrcr; /* 0x100 Master Remap Control */
u32 reserve4[3];
#if defined(CONFIG_AT91SAM9G45)
- u32 ccr[52] /* 0x110 - 0x1E0 Chip Configuration */
+ u32 ccr[52]; /* 0x110 - 0x1E0 Chip Configuration */
u32 womr; /* 0x1E4 Write Protect Mode */
u32 wpsr; /* 0x1E8 Write Protect Status */
u32 resg45_1[10];
diff --git a/include/asm-arm/arch-spear/spr_gpt.h b/include/asm-arm/arch-spear/spr_gpt.h
index 965b5ab..965b5ab 100755..100644
--- a/include/asm-arm/arch-spear/spr_gpt.h
+++ b/include/asm-arm/arch-spear/spr_gpt.h
diff --git a/include/asm-arm/arch-spear/spr_i2c.h b/include/asm-arm/arch-spear/spr_i2c.h
index 7521ebc..7521ebc 100755..100644
--- a/include/asm-arm/arch-spear/spr_i2c.h
+++ b/include/asm-arm/arch-spear/spr_i2c.h
diff --git a/include/asm-arm/arch-spear/spr_smi.h b/include/asm-arm/arch-spear/spr_smi.h
index 06df745..06df745 100755..100644
--- a/include/asm-arm/arch-spear/spr_smi.h
+++ b/include/asm-arm/arch-spear/spr_smi.h
diff --git a/include/asm-arm/arch-spear/spr_xloader_table.h b/include/asm-arm/arch-spear/spr_xloader_table.h
index 7e3da18..7e3da18 100755..100644
--- a/include/asm-arm/arch-spear/spr_xloader_table.h
+++ b/include/asm-arm/arch-spear/spr_xloader_table.h
diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h
index 0248aba..0248aba 100755..100644
--- a/include/configs/spear3xx.h
+++ b/include/configs/spear3xx.h
diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h
index 2ad5beb..2ad5beb 100755..100644
--- a/include/configs/spear6xx.h
+++ b/include/configs/spear6xx.h
diff --git a/include/usb/spr_udc.h b/include/usb/spr_udc.h
index 2c332d5..2c332d5 100755..100644
--- a/include/usb/spr_udc.h
+++ b/include/usb/spr_udc.h