Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259543
b: refs/heads/master
c: 106fb49
h: refs/heads/master
i:
  259541: 1567858
  259539: 6ab92cb
  259535: 186bd6b
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent d4155ea commit 814765f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 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: 292cb18a802c21434206b578d12b05793950cad9
refs/heads/master: 106fb49f72602470bae3c83d1899156768219aa2
9 changes: 3 additions & 6 deletions trunk/drivers/staging/mei/mei_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,10 @@ int mei_task_initialize_clients(void *data);
int mei_initialize_clients(struct mei_device *dev);
struct mei_cl *mei_alloc_file_private(struct mei_device *dev);
int mei_disconnect_host_client(struct mei_device *dev, struct mei_cl *cl);
void mei_initialize_list(struct mei_io_list *list,
struct mei_device *dev);
void mei_initialize_list(struct mei_io_list *list, struct mei_device *dev);
void mei_flush_list(struct mei_io_list *list, struct mei_cl *cl);
void mei_flush_queues(struct mei_device *dev, struct mei_cl *cl);
void mei_remove_client_from_file_list(struct mei_device *dev,
u8 host_client_id);
void mei_remove_client_from_file_list(struct mei_device *dev, u8 host_client_id);
void host_init_iamthif(struct mei_device *dev);
void mei_init_file_private(struct mei_cl *priv, struct mei_device *dev);
void allocate_me_clients_storage(struct mei_device *dev);
Expand Down Expand Up @@ -339,8 +337,7 @@ int mei_find_me_client_index(const struct mei_device *dev, uuid_le cuuid);
*
* returns the byte read.
*/
static inline u32 mei_reg_read(struct mei_device *dev,
unsigned long offset)
static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset)
{
return ioread32(dev->mem_addr + offset);
}
Expand Down

0 comments on commit 814765f

Please sign in to comment.