From 9c0ed12673dde5d2e4ca2cdb5613e4a39b581c08 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Tue, 25 Dec 2012 19:06:04 +0200 Subject: [PATCH] --- yaml --- r: 354889 b: refs/heads/master c: fecb0d584ee96fb2ab3c65825029a66a23ee7e31 h: refs/heads/master i: 354887: bcea06f7e03a39f5955affd9f31514f0d8ae2c8b v: v3 --- [refs] | 2 +- trunk/drivers/misc/mei/mei_dev.h | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 58e6455bf3aa..5d056b3bf455 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47a73801f498883ea3acccb8f6ff1b5c7a3553de +refs/heads/master: fecb0d584ee96fb2ab3c65825029a66a23ee7e31 diff --git a/trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h index f0b02ba89ade..6ea430e49f13 100644 --- a/trunk/drivers/misc/mei/mei_dev.h +++ b/trunk/drivers/misc/mei/mei_dev.h @@ -201,6 +201,7 @@ struct mei_cl { /** * struct mei_device - MEI private device struct + * @mem_addr - mem mapped base register address * @hbuf_depth - depth of host(write) buffer * @wr_ext_msg - buffer for hbm control responses (set in read cycle) */ @@ -221,11 +222,7 @@ struct mei_device { */ struct list_head file_list; long open_handle_count; - /* - * memory of device - */ - unsigned int mem_base; - unsigned int mem_length; + void __iomem *mem_addr; /* * lock for the device