From 9fbe0deb0e6ced4ce3a879d92e8fd78eaf3f2c23 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Fri, 12 Nov 2010 11:15:47 +0000 Subject: [PATCH] --- yaml --- r: 228108 b: refs/heads/master c: e20cbcf199e2c3e4a4822e890726c49b70a4d280 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/vme/bridges/vme_tsi148.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6fb17fc7fdcd..cc28cae4e677 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0599726793d6dca6bd171cd4e497f9aac21e8f0c +refs/heads/master: e20cbcf199e2c3e4a4822e890726c49b70a4d280 diff --git a/trunk/drivers/staging/vme/bridges/vme_tsi148.h b/trunk/drivers/staging/vme/bridges/vme_tsi148.h index bda64ef85754..9f97fa8084e8 100644 --- a/trunk/drivers/staging/vme/bridges/vme_tsi148.h +++ b/trunk/drivers/staging/vme/bridges/vme_tsi148.h @@ -35,7 +35,7 @@ /* Structure used to hold driver specific information */ struct tsi148_driver { - void *base; /* Base Address of device registers */ + void __iomem *base; /* Base Address of device registers */ wait_queue_head_t dma_queue[2]; wait_queue_head_t iack_queue; void (*lm_callback[4])(int); /* Called in interrupt handler */