diff --git a/[refs] b/[refs]
index f33a3d4690e1..1b6d867713c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33cb4f345687a27e3fece0a7fcf78ac2e7b0a7d6
+refs/heads/master: 3a4ffe930a2d2dad07604fe74d21b878decc6461
diff --git a/trunk/drivers/base/soc.c b/trunk/drivers/base/soc.c
index f49346b9e961..ba29b2e73d48 100644
--- a/trunk/drivers/base/soc.c
+++ b/trunk/drivers/base/soc.c
@@ -15,7 +15,7 @@
 #include <linux/sys_soc.h>
 #include <linux/err.h>
 
-static DEFINE_IDR(soc_ida);
+static DEFINE_IDA(soc_ida);
 static DEFINE_SPINLOCK(soc_lock);
 
 static ssize_t soc_info_get(struct device *dev,