diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/pci/hotplug/pcihp_skeleton.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/pci/hotplug/pcihp_skeleton.c')
| -rw-r--r-- | drivers/pci/hotplug/pcihp_skeleton.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pcihp_skeleton.c b/drivers/pci/hotplug/pcihp_skeleton.c index e3dd6cf9e89f..5175d9b26f0b 100644 --- a/drivers/pci/hotplug/pcihp_skeleton.c +++ b/drivers/pci/hotplug/pcihp_skeleton.c | |||
| @@ -82,7 +82,6 @@ static int get_latch_status (struct hotplug_slot *slot, u8 *value); | |||
| 82 | static int get_adapter_status (struct hotplug_slot *slot, u8 *value); | 82 | static int get_adapter_status (struct hotplug_slot *slot, u8 *value); |
| 83 | 83 | ||
| 84 | static struct hotplug_slot_ops skel_hotplug_slot_ops = { | 84 | static struct hotplug_slot_ops skel_hotplug_slot_ops = { |
| 85 | .owner = THIS_MODULE, | ||
| 86 | .enable_slot = enable_slot, | 85 | .enable_slot = enable_slot, |
| 87 | .disable_slot = disable_slot, | 86 | .disable_slot = disable_slot, |
| 88 | .set_attention_status = set_attention_status, | 87 | .set_attention_status = set_attention_status, |