diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-29 09:58:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-29 09:58:19 +1000 |
| commit | 35c50647860928192a816b2231d986a374a19ee9 (patch) | |
| tree | 0f9f9ad60bada925fc546547e9c3f818ebedc062 /drivers | |
| parent | 710629e5841d300c18f6067fb7df20f081b3e035 (diff) | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
Merge commit 'powerpc/powerpc-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/ams/ams.h | 2 | ||||
| -rw-r--r-- | drivers/pci/hotplug/rpaphp_slot.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h index a6221e5dd984..221ef6915a5f 100644 --- a/drivers/hwmon/ams/ams.h +++ b/drivers/hwmon/ams/ams.h @@ -4,7 +4,7 @@ #include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/types.h> -#include <asm/of_device.h> +#include <linux/of_device.h> enum ams_irq { AMS_IRQ_FREEFALL = 0x01, diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c index 9b714ea93d20..50884507b8be 100644 --- a/drivers/pci/hotplug/rpaphp_slot.c +++ b/drivers/pci/hotplug/rpaphp_slot.c @@ -147,9 +147,5 @@ int rpaphp_register_slot(struct slot *slot) list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head); info("Slot [%s] registered\n", slot->name); return 0; - -sysfs_fail: - pci_hp_deregister(php_slot); - return retval; } |