diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/pci/hotplug/fakephp.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/pci/hotplug/fakephp.c')
| -rw-r--r-- | drivers/pci/hotplug/fakephp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 6151389fd903..5317e4d7d96e 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include "../pci.h" | 23 | #include "../pci.h" |
| 23 | 24 | ||
| 24 | struct legacy_slot { | 25 | struct legacy_slot { |
| @@ -73,7 +74,7 @@ static void legacy_release(struct kobject *kobj) | |||
| 73 | } | 74 | } |
| 74 | 75 | ||
| 75 | static struct kobj_type legacy_ktype = { | 76 | static struct kobj_type legacy_ktype = { |
| 76 | .sysfs_ops = &(struct sysfs_ops){ | 77 | .sysfs_ops = &(const struct sysfs_ops){ |
| 77 | .store = legacy_store, .show = legacy_show | 78 | .store = legacy_store, .show = legacy_show |
| 78 | }, | 79 | }, |
| 79 | .release = &legacy_release, | 80 | .release = &legacy_release, |