Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354889
b: refs/heads/master
c: fecb0d5
h: refs/heads/master
i:
  354887: bcea06f
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent af12b04 commit 9c0ed12
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: 47a73801f498883ea3acccb8f6ff1b5c7a3553de
refs/heads/master: fecb0d584ee96fb2ab3c65825029a66a23ee7e31
7 changes: 2 additions & 5 deletions trunk/drivers/misc/mei/mei_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/
Expand All @@ -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
Expand Down

0 comments on commit 9c0ed12

Please sign in to comment.