summaryrefslogtreecommitdiff
path: root/arch/arm/tools
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-06-26 19:59:19 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-06-26 19:59:19 -0700
commit3225a5c872d8964c63ce7a14a223bd7962467c96 (patch)
tree14932c4003f4737ae46e1bcd30d94e2e1bd99caa /arch/arm/tools
parentf07c3aa657cdff47c42a1f638e9a5c61d3c2a781 (diff)
parent967ef3dfcf0cb1f7883ffc7374d80ef1fca6470b (diff)
Merge branch 'boardfiles/cardhu' into after-boardfiles
Diffstat (limited to 'arch/arm/tools')
-rw-r--r--arch/arm/tools/mach-types1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 27dc2bd5a879..508482ca7357 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -1102,4 +1102,5 @@ sam9repeater MACH_SAM9REPEATER SAM9REPEATER 3424
# Aruba
aruba MACH_ARUBA ARUBA 3437
# Cardhu
+cardhu MACH_CARDHU CARDHU 3436
# Enterprise