diff options
| author | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-19 14:42:22 -0700 |
| commit | ab2965eefef95a2eecfd54c12b0eb243162862e9 (patch) | |
| tree | c947fdc158e144c2d060486b65d10ee67d254039 /drivers/base | |
| parent | a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595 (diff) | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 (diff) | |
Merge commit 'v3.4-rc3' into android-3.4
Conflicts:
drivers/staging/android/lowmemorykiller.c
Change-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/soc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/soc.c b/drivers/base/soc.c index 05f150382da..ba29b2e73d4 100644 --- a/drivers/base/soc.c +++ b/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, @@ -168,8 +168,6 @@ void soc_device_unregister(struct soc_device *soc_dev) static int __init soc_bus_register(void) { - spin_lock_init(&soc_lock); - return bus_register(&soc_bus_type); } core_initcall(soc_bus_register); |