Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228105
b: refs/heads/master
c: 0a81a0f
h: refs/heads/master
i:
  228103: a5bec1b
v: v3
  • Loading branch information
Emilio G. Cota authored and Greg Kroah-Hartman committed Nov 16, 2010
1 parent d7b9fbb commit 586a5c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c949231838006d7de4ad38be38d9e112826862da
refs/heads/master: 0a81a0f768e5bb0c32db6e44440c5b7c1b4658e7
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vme/devices/vme_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static unsigned int bus_num;
* Structure to handle image related parameters.
*/
typedef struct {
void __iomem *kern_buf; /* Buffer address in kernel space */
void *kern_buf; /* Buffer address in kernel space */
dma_addr_t pci_buf; /* Buffer address in PCI address space */
unsigned long long size_buf; /* Buffer size */
struct semaphore sem; /* Semaphore for locking image */
Expand Down Expand Up @@ -277,7 +277,7 @@ static ssize_t resource_from_user(unsigned int minor, const char *buf,
static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
size_t count, loff_t *ppos)
{
void __iomem *image_ptr;
void *image_ptr;
ssize_t retval;

image_ptr = image[minor].kern_buf + *ppos;
Expand All @@ -296,7 +296,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf,
static ssize_t buffer_from_user(unsigned int minor, const char *buf,
size_t count, loff_t *ppos)
{
void __iomem *image_ptr;
void *image_ptr;
size_t retval;

image_ptr = image[minor].kern_buf + *ppos;
Expand Down

0 comments on commit 586a5c5

Please sign in to comment.