aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/pci.h
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-11 15:46:14 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-16 16:00:12 +0900
commitd0e3db40e2a1352aa2a2f425a7d4631bddc03d51 (patch)
tree275392db569a7f3808d8f86cfcb4874bfe81f997 /arch/sh/include/asm/pci.h
parentb8b47bfbe4eb1ae0e6891e49c86a5f4fb00413be (diff)
downloadkernel_samsung_smdk4412-d0e3db40e2a1352aa2a2f425a7d4631bddc03d51.tar.gz
kernel_samsung_smdk4412-d0e3db40e2a1352aa2a2f425a7d4631bddc03d51.tar.bz2
kernel_samsung_smdk4412-d0e3db40e2a1352aa2a2f425a7d4631bddc03d51.zip
sh: add init member to pci_channel data
This patch adds an init callback to struct pci_channel and makes sure it is initialized properly. Code is added to call this init function from pcibios_init(). Return values are adjusted and a warning is is printed if init fails. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/pci.h')
-rw-r--r--arch/sh/include/asm/pci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index df1d383e18a..5c7a8f1d2d5 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -17,11 +17,13 @@
* external) PCI controllers.
*/
struct pci_channel {
+ int (*init)(struct pci_channel *chan);
struct pci_ops *pci_ops;
struct resource *io_resource;
struct resource *mem_resource;
int first_devfn;
int last_devfn;
+ int enabled;
};
/*