diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /arch/ppc64/kernel/pci.c | |
| parent | 325a479c4c110db278ef3361460a48c4093252cc (diff) | |
| parent | 1016888fb69662936b32ab767c7419a3be9a69d3 (diff) | |
| download | kernel_samsung_crespo-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip kernel_samsung_crespo-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.gz kernel_samsung_crespo-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.bz2 | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ppc64/kernel/pci.c')
| -rw-r--r-- | arch/ppc64/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index be3cc38..d786d4b 100644 --- a/arch/ppc64/kernel/pci.c +++ b/arch/ppc64/kernel/pci.c @@ -438,7 +438,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file, int i; if (page_is_ram(offset >> PAGE_SHIFT)) - return prot; + return __pgprot(prot); prot |= _PAGE_NO_CACHE | _PAGE_GUARDED; |