diff options
author | Mark Lord <lkml@rtr.ca> | 2007-11-28 18:11:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 18:04:22 -0500 |
commit | 0a3c33d77ff7ad5b988997536a8f09c49e35ad20 (patch) | |
tree | 62fa58c6aa0e51ee1e01a27580cfddb24aa88acf /drivers/pci/hotplug/pciehp.h | |
parent | a6f29a98af278a8d784a870ae9f08e530de73ffe (diff) |
PCIE: fix PCIe Hotplug so that it works with ExpressCard slots on Dell notebooks (and others?) in conjunction with modparam of pciehp_force=1.
Fix pciehp_probe() to deal with ExpressCard cards
that were inserted prior to the driver being loaded.
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r-- | drivers/pci/hotplug/pciehp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 7959c222dc24..968f57087ce0 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h | |||
@@ -161,6 +161,7 @@ extern int pciehp_configure_device(struct slot *p_slot); | |||
161 | extern int pciehp_unconfigure_device(struct slot *p_slot); | 161 | extern int pciehp_unconfigure_device(struct slot *p_slot); |
162 | extern void pciehp_queue_pushbutton_work(struct work_struct *work); | 162 | extern void pciehp_queue_pushbutton_work(struct work_struct *work); |
163 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); | 163 | int pcie_init(struct controller *ctrl, struct pcie_device *dev); |
164 | int pciehp_enable_slot(struct slot *p_slot); | ||
164 | 165 | ||
165 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) | 166 | static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device) |
166 | { | 167 | { |