git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge current mainline tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
pci
/
search.c
diff --git
a/drivers/pci/search.c
b/drivers/pci/search.c
index
3b3b5f1
..
4edfc47
100644
(file)
--- a/
drivers/pci/search.c
+++ b/
drivers/pci/search.c
@@
-162,7
+162,7
@@
EXPORT_SYMBOL(pci_find_slot);
* time.
*/
struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
* time.
*/
struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device,
-
const
struct pci_dev *from)
+ struct pci_dev *from)
{
struct pci_dev *pdev;
{
struct pci_dev *pdev;
@@
-263,7
+263,7
@@
static int match_pci_dev_by_id(struct device *dev, void *data)
* this file.
*/
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
* this file.
*/
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
-
const
struct pci_dev *from)
+ struct pci_dev *from)
{
struct device *dev;
struct device *dev_start = NULL;
{
struct device *dev;
struct device *dev_start = NULL;
@@
-303,7
+303,7
@@
static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
*/
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device,
*/
struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
unsigned int ss_vendor, unsigned int ss_device,
-
const
struct pci_dev *from)
+ struct pci_dev *from)
{
struct pci_dev *pdev;
struct pci_device_id *id;
{
struct pci_dev *pdev;
struct pci_device_id *id;