diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-01-28 22:38:25 +0100 |
commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /arch/sparc/kernel/pci.c | |
parent | of: unify phandle name in struct device_node (diff) | |
parent | Linux 2.6.33-rc5 (diff) | |
download | linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz linux-0ada0a73120c28cc432bcdbac061781465c2f48f.zip |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'arch/sparc/kernel/pci.c')
-rw-r--r-- | arch/sparc/kernel/pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index c68648662802..539e83f8e087 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -1064,7 +1064,6 @@ int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask) return (device_mask & dma_addr_mask) == dma_addr_mask; } -EXPORT_SYMBOL(pci_dma_supported); void pci_resource_to_user(const struct pci_dev *pdev, int bar, const struct resource *rp, resource_size_t *start, @@ -1081,3 +1080,10 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar, *start = rp->start - offset; *end = rp->end - offset; } + +static int __init pcibios_init(void) +{ + pci_dfl_cache_line_size = 64 >> 2; + return 0; +} +subsys_initcall(pcibios_init); |