lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

Browse Source 
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  remove "struct subsystem" as it is no longer needed
  sysfs: printk format warning
  DOC: Fix wrong identifier name in Documentation/driver-model/devres.txt
  platform: reorder platform_device_del
  Driver core: fix show_uevent from taking up way too much stack
This commit is contained in:
Linus Torvalds
2007-05-04 18:04:48 -07:00
parent 89661adaae 823bccfc40
commit 5b33991576
49 changed files with 244 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/device.h
View File

@ -53,7 +53,7 @@ struct bus_type {
const char * name;
struct module * owner;
struct subsystem subsys;
struct kset subsys;
struct kset drivers;
struct kset devices;
struct klist klist_devices;
@ -178,7 +178,7 @@ struct class {
const char * name;
struct module * owner;
struct subsystem subsys;
struct kset subsys;
struct list_head children;
struct list_head devices;
struct list_head interfaces;
@ -558,8 +558,8 @@ extern void device_shutdown(void);
/* drivers/base/firmware.c */
extern int __must_check firmware_register(struct subsystem *);
extern void firmware_unregister(struct subsystem *);
extern int __must_check firmware_register(struct kset *);
extern void firmware_unregister(struct kset *);
/* debugging and troubleshooting/diagnostic helpers. */
extern const char *dev_driver_string(struct device *dev);