diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-06-10 01:25:48 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-06-10 01:25:48 -0700 |
| commit | be9e929da5c6deff7004e455010965ef71998324 (patch) | |
| tree | fffaa7c1ddab0af300d720828e3b4eab5c53f4b2 /include/linux/device.h | |
| parent | ae6a0c465d560a2c5e1fa16dd3d2ed769119cf2c (diff) | |
| parent | 3d983e57eeb0d84ffafe1bb5b78688646ebd1d17 (diff) | |
Hand merge
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 3604d351f3f0..1bd92551c077 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -351,30 +351,6 @@ extern int (*platform_notify_remove)(struct device * dev); extern struct device * get_device(struct device * dev); extern void put_device(struct device * dev); -/* drivers/base/sys.c */ - -struct sys_root { - u32 id; - struct device dev; - struct device sysdev; -}; - -extern int sys_register_root(struct sys_root *); -extern void sys_unregister_root(struct sys_root *); - - -struct sys_device { - char * name; - u32 id; - struct sys_root * root; - struct device dev; - struct class_device class_dev; -}; - -extern int sys_device_register(struct sys_device *); -extern void sys_device_unregister(struct sys_device *); - -extern struct bus_type system_bus_type; /* drivers/base/platform.c */ |