Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324466
b: refs/heads/master
c: 5b47f3c
h: refs/heads/master
v: v3
  • Loading branch information
Samuel Iglesias Gonsálvez authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 2b941a5 commit f725b91
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f45651f9bb22f7ab60d806707be2c75f3d219157
refs/heads/master: 5b47f3cbf03f69efc24b34200d6b432fe354b8d5
8 changes: 4 additions & 4 deletions trunk/drivers/staging/ipack/bridges/tpci200.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,15 @@ static int tpci200_register(struct tpci200_board *tpci200)

/* Map internal tpci200 driver user space */
tpci200->info->interface_regs =
ioremap(pci_resource_start(tpci200->info->pdev,
ioremap_nocache(pci_resource_start(tpci200->info->pdev,
TPCI200_IP_INTERFACE_BAR),
TPCI200_IFACE_SIZE);
tpci200->info->ioidint_space =
ioremap(pci_resource_start(tpci200->info->pdev,
ioremap_nocache(pci_resource_start(tpci200->info->pdev,
TPCI200_IO_ID_INT_SPACES_BAR),
TPCI200_IOIDINT_SIZE);
tpci200->info->mem8_space =
ioremap(pci_resource_start(tpci200->info->pdev,
ioremap_nocache(pci_resource_start(tpci200->info->pdev,
TPCI200_MEM8_SPACE_BAR),
TPCI200_MEM8_SIZE);

Expand Down Expand Up @@ -677,7 +677,7 @@ static int tpci200_slot_map_space(struct ipack_device *dev,

virt_addr_space->size = size_to_map;
virt_addr_space->address =
ioremap((unsigned long)phys_address, size_to_map);
ioremap_nocache((unsigned long)phys_address, size_to_map);

out_unlock:
mutex_unlock(&tpci200->mutex);
Expand Down

0 comments on commit f725b91

Please sign in to comment.