projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
drivers
/
macintosh
/
macio_asic.c
diff --git
a/drivers/macintosh/macio_asic.c
b/drivers/macintosh/macio_asic.c
index
1ee0033
..
228e185
100644
(file)
--- a/
drivers/macintosh/macio_asic.c
+++ b/
drivers/macintosh/macio_asic.c
@@
-17,6
+17,8
@@
#include <linux/pci_ids.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/pci_ids.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/slab.h>
+
#include <asm/machdep.h>
#include <asm/macio.h>
#include <asm/pmac_feature.h>
#include <asm/machdep.h>
#include <asm/macio.h>
#include <asm/pmac_feature.h>
@@
-126,7
+128,7
@@
static int macio_device_resume(struct device * dev)
return 0;
}
return 0;
}
-static int macio_
hotplug
(struct device *dev, char **envp, int num_envp,
+static int macio_
uevent
(struct device *dev, char **envp, int num_envp,
char *buffer, int buffer_size)
{
struct macio_dev * macio_dev;
char *buffer, int buffer_size)
{
struct macio_dev * macio_dev;
@@
-201,7
+203,7
@@
extern struct device_attribute macio_dev_attrs[];
struct bus_type macio_bus_type = {
.name = "macio",
.match = macio_bus_match,
struct bus_type macio_bus_type = {
.name = "macio",
.match = macio_bus_match,
- .
hotplug = macio_hotplug
,
+ .
uevent = macio_uevent
,
.suspend = macio_device_suspend,
.resume = macio_device_resume,
.dev_attrs = macio_dev_attrs,
.suspend = macio_device_suspend,
.resume = macio_device_resume,
.dev_attrs = macio_dev_attrs,