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 /include/linux/device.h | |
| 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 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 8c23e3dfe3ac..15e9fa3ad3af 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
| @@ -183,7 +183,6 @@ struct class { | |||
| 183 | struct module *owner; | 183 | struct module *owner; |
| 184 | 184 | ||
| 185 | struct kset subsys; | 185 | struct kset subsys; |
| 186 | struct list_head children; | ||
| 187 | struct list_head devices; | 186 | struct list_head devices; |
| 188 | struct list_head interfaces; | 187 | struct list_head interfaces; |
| 189 | struct kset class_dirs; | 188 | struct kset class_dirs; |