summaryrefslogtreecommitdiffstats
path: root/drivers/ssb/scan.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
committerNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
commitbb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch)
tree191bc24dd97bcb174535cc217af082f16da3b43d /drivers/ssb/scan.c
parentmd/RAID1: Add missing case for attempting to repair known bad blocks. (diff)
parentdm raid: move sectors_per_dev calculation (diff)
downloadlinux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.tar.xz
linux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.zip
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'drivers/ssb/scan.c')
-rw-r--r--drivers/ssb/scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
index 266c7c5c86dc..ab4627cf1114 100644
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
@@ -90,6 +90,8 @@ const char *ssb_core_name(u16 coreid)
return "ARM 1176";
case SSB_DEV_ARM_7TDMI:
return "ARM 7TDMI";
+ case SSB_DEV_ARM_CM3:
+ return "ARM Cortex M3";
}
return "UNKNOWN";
}