Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 162382
b: refs/heads/master
c: 790cf1b
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 9012255 commit 761a85f
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 65 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: 3b66bb651e6b29c1976b6d407cb53f11fcb8e7e0
refs/heads/master: 790cf1b912d3166746c8a1e1e807019a397d85d9
14 changes: 7 additions & 7 deletions trunk/drivers/staging/sep/sep_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ struct sep_device {
void __iomem *io_addr;

/* restricted access region */
unsigned long rar_bus;
dma_addr_t rar_bus;
void *rar_addr;

/* shared memory region */
unsigned long shared_bus;
dma_addr_t shared_bus;
void *shared_addr;

/* firmware regions */
unsigned long cache_bus;
dma_addr_t cache_bus;
unsigned long cache_size;
void *cache_addr;

unsigned long resident_bus;
dma_addr_t resident_bus;
unsigned long resident_size;
void *resident_addr;

Expand Down Expand Up @@ -87,12 +87,12 @@ struct sep_device {
struct workqueue_struct *flow_wq;

/* address of the shared memory allocated during init for SEP driver */
unsigned long shared_area;
void *shared_area;
/* the physical address of the shared area */
unsigned long shared_area_bus;
dma_addr_t shared_area_bus;

/* Message Shared Area start address - will be allocated during init */
unsigned long message_shared_area_addr;
void *message_shared_area_addr;
};

static struct sep_device *sep_dev;
Expand Down
Loading

0 comments on commit 761a85f

Please sign in to comment.