diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 14:13:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 14:13:44 -0400 |
| commit | fc99824c427ed998e3c5e376bd9c640fde1c407c (patch) | |
| tree | ae8167c0ac824d76cd63f443c631d8a101d18666 /drivers/base | |
| parent | e90a4e475a8b34adbefe189c9d0932fa0b7b750f (diff) | |
| parent | 0a3ad00ca09632c6d0675f606276e92bdf1b306c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
Driver core: struct class remove children list
block: do_mounts - accept root=<non-existant partition>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/class.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index 0ef00e8d4153..e085af0ff94f 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c | |||
| @@ -140,7 +140,6 @@ int class_register(struct class *cls) | |||
| 140 | 140 | ||
| 141 | pr_debug("device class '%s': registering\n", cls->name); | 141 | pr_debug("device class '%s': registering\n", cls->name); |
| 142 | 142 | ||
| 143 | INIT_LIST_HEAD(&cls->children); | ||
| 144 | INIT_LIST_HEAD(&cls->devices); | 143 | INIT_LIST_HEAD(&cls->devices); |
| 145 | INIT_LIST_HEAD(&cls->interfaces); | 144 | INIT_LIST_HEAD(&cls->interfaces); |
| 146 | kset_init(&cls->class_dirs); | 145 | kset_init(&cls->class_dirs); |