---

yaml --- r: 314013 b: refs/heads/master c: ccaf8c3 h: refs/heads/master i: 314011: 43cacbf v: v3
git-mirror · Jun 6, 2012 · 730d385 · 730d385
1 parent 1e5bd75
commit 730d385
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b08cf6bd2763bfe9d04fad4d7de29ee7735cd76
+refs/heads/master: ccaf8c32d5ed08bfb4c45492f8f1c145fd45f4e8
diff --git a/trunk/drivers/ssb/scan.c b/trunk/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";
 }

diff --git a/trunk/include/linux/ssb/ssb.h b/trunk/include/linux/ssb/ssb.h
@@ -243,6 +243,7 @@ struct ssb_bus_ops {
 #define SSB_DEV_MINI_MACPHY	0x823
 #define SSB_DEV_ARM_1176	0x824
 #define SSB_DEV_ARM_7TDMI	0x825
+#define SSB_DEV_ARM_CM3		0x82A
 
 /* Vendor-ID values */
 #define SSB_VENDOR_BROADCOM	0x4243