diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:12:58 -0400 |
| commit | e766f1cc596078b1603ac2c96617660c4c7e2d81 (patch) | |
| tree | 86f24a621dbe39fd25dcec539c2f969f50bfbcab /arch/sparc64/kernel/pci.c | |
| parent | 48467641bcc057f7cba3b6cbbe66cb834d64cc81 (diff) | |
| parent | ebede60741e2cec6d210f137fd22a30e37abc0be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/pci.c')
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index f21c993f8856..ec8bf4012c0c 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c | |||
| @@ -736,8 +736,7 @@ static void __pci_mmap_set_flags(struct pci_dev *dev, struct vm_area_struct *vma | |||
| 736 | static void __pci_mmap_set_pgprot(struct pci_dev *dev, struct vm_area_struct *vma, | 736 | static void __pci_mmap_set_pgprot(struct pci_dev *dev, struct vm_area_struct *vma, |
| 737 | enum pci_mmap_state mmap_state) | 737 | enum pci_mmap_state mmap_state) |
| 738 | { | 738 | { |
| 739 | /* Our io_remap_page_range/io_remap_pfn_range takes care of this, | 739 | /* Our io_remap_pfn_range takes care of this, do nothing. */ |
| 740 | do nothing. */ | ||
| 741 | } | 740 | } |
| 742 | 741 | ||
| 743 | /* Perform the actual remap of the pages for a PCI device mapping, as appropriate | 742 | /* Perform the actual remap of the pages for a PCI device mapping, as appropriate |