diff options
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc8313_rdb.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_itx.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc834x_mds.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc83xx.h | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/83xx/pci.c | 7 |
8 files changed, 0 insertions, 19 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc8313_rdb.c index 3edfe170a03b..140b46ffdb19 100644 --- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c | |||
@@ -45,8 +45,6 @@ static void __init mpc8313_rdb_setup_arch(void) | |||
45 | #ifdef CONFIG_PCI | 45 | #ifdef CONFIG_PCI |
46 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 46 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
47 | mpc83xx_add_bridge(np); | 47 | mpc83xx_add_bridge(np); |
48 | |||
49 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
50 | #endif | 48 | #endif |
51 | mpc831x_usb_cfg(); | 49 | mpc831x_usb_cfg(); |
52 | } | 50 | } |
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 61e3f1cb0a7e..d494bc456458 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c | |||
@@ -75,7 +75,6 @@ static void __init mpc832x_sys_setup_arch(void) | |||
75 | #ifdef CONFIG_PCI | 75 | #ifdef CONFIG_PCI |
76 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 76 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
77 | mpc83xx_add_bridge(np); | 77 | mpc83xx_add_bridge(np); |
78 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
79 | #endif | 78 | #endif |
80 | 79 | ||
81 | #ifdef CONFIG_QUICC_ENGINE | 80 | #ifdef CONFIG_QUICC_ENGINE |
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 090906170a41..e6c1760f36ef 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c | |||
@@ -49,8 +49,6 @@ static void __init mpc832x_rdb_setup_arch(void) | |||
49 | #ifdef CONFIG_PCI | 49 | #ifdef CONFIG_PCI |
50 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 50 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
51 | mpc83xx_add_bridge(np); | 51 | mpc83xx_add_bridge(np); |
52 | |||
53 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
54 | #endif | 52 | #endif |
55 | 53 | ||
56 | #ifdef CONFIG_QUICC_ENGINE | 54 | #ifdef CONFIG_QUICC_ENGINE |
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c index 6d06645e5ba8..870fd20461ce 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_itx.c +++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c | |||
@@ -54,8 +54,6 @@ static void __init mpc834x_itx_setup_arch(void) | |||
54 | #ifdef CONFIG_PCI | 54 | #ifdef CONFIG_PCI |
55 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 55 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
56 | mpc83xx_add_bridge(np); | 56 | mpc83xx_add_bridge(np); |
57 | |||
58 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
59 | #endif | 57 | #endif |
60 | 58 | ||
61 | mpc834x_usb_cfg(); | 59 | mpc834x_usb_cfg(); |
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c index f8aba9a488bc..a9140b64b98a 100644 --- a/arch/powerpc/platforms/83xx/mpc834x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c | |||
@@ -85,8 +85,6 @@ static void __init mpc834x_mds_setup_arch(void) | |||
85 | #ifdef CONFIG_PCI | 85 | #ifdef CONFIG_PCI |
86 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 86 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
87 | mpc83xx_add_bridge(np); | 87 | mpc83xx_add_bridge(np); |
88 | |||
89 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
90 | #endif | 88 | #endif |
91 | 89 | ||
92 | mpc834xemds_usb_cfg(); | 90 | mpc834xemds_usb_cfg(); |
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 69970b910c12..db6957611585 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c | |||
@@ -81,7 +81,6 @@ static void __init mpc836x_mds_setup_arch(void) | |||
81 | #ifdef CONFIG_PCI | 81 | #ifdef CONFIG_PCI |
82 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) | 82 | for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) |
83 | mpc83xx_add_bridge(np); | 83 | mpc83xx_add_bridge(np); |
84 | ppc_md.pci_exclude_device = mpc83xx_exclude_device; | ||
85 | #endif | 84 | #endif |
86 | 85 | ||
87 | #ifdef CONFIG_QUICC_ENGINE | 86 | #ifdef CONFIG_QUICC_ENGINE |
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h index 589ee55730f3..b778cb4f3fb5 100644 --- a/arch/powerpc/platforms/83xx/mpc83xx.h +++ b/arch/powerpc/platforms/83xx/mpc83xx.h | |||
@@ -49,8 +49,6 @@ | |||
49 | */ | 49 | */ |
50 | 50 | ||
51 | extern int mpc83xx_add_bridge(struct device_node *dev); | 51 | extern int mpc83xx_add_bridge(struct device_node *dev); |
52 | extern int mpc83xx_exclude_device(struct pci_controller *hose, | ||
53 | u_char bus, u_char devfn); | ||
54 | extern void mpc83xx_restart(char *cmd); | 52 | extern void mpc83xx_restart(char *cmd); |
55 | extern long mpc83xx_time_init(void); | 53 | extern long mpc83xx_time_init(void); |
56 | extern int mpc834x_usb_cfg(void); | 54 | extern int mpc834x_usb_cfg(void); |
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c index 92069469de20..80425d7b14f8 100644 --- a/arch/powerpc/platforms/83xx/pci.c +++ b/arch/powerpc/platforms/83xx/pci.c | |||
@@ -33,13 +33,6 @@ | |||
33 | #define DBG(x...) | 33 | #define DBG(x...) |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) | ||
37 | { | ||
38 | if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0) | ||
39 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
40 | return PCIBIOS_SUCCESSFUL; | ||
41 | } | ||
42 | |||
43 | int __init mpc83xx_add_bridge(struct device_node *dev) | 36 | int __init mpc83xx_add_bridge(struct device_node *dev) |
44 | { | 37 | { |
45 | int len; | 38 | int len; |