diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /drivers/pci/setup-res.c | |
parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/pci/setup-res.c')
-rw-r--r-- | drivers/pci/setup-res.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 50d6685dcbcc..ea9277b7f899 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c | |||
@@ -112,6 +112,7 @@ pci_claim_resource(struct pci_dev *dev, int resource) | |||
112 | 112 | ||
113 | return err; | 113 | return err; |
114 | } | 114 | } |
115 | EXPORT_SYMBOL_GPL(pci_claim_resource); | ||
115 | 116 | ||
116 | int pci_assign_resource(struct pci_dev *dev, int resno) | 117 | int pci_assign_resource(struct pci_dev *dev, int resno) |
117 | { | 118 | { |