Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354886
b: refs/heads/master
c: 1d3f3da
h: refs/heads/master
v: v3
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 028e48e commit 67cca99
Show file tree
Hide file tree
Showing 3 changed files with 7 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: 15d4acc57f23b6e02e587b773458a7c0e23e501d
refs/heads/master: 1d3f3da3e20b154eecf840c2e589130868a98634
5 changes: 0 additions & 5 deletions trunk/drivers/misc/mei/hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
#define MEI_IAMTHIF_STALL_TIMER 12 /* HPS */
#define MEI_IAMTHIF_READ_TIMER 10 /* HPS */

/*
* Internal Clients Number
*/
#define MEI_WD_HOST_CLIENT_ID 1
#define MEI_IAMTHIF_HOST_CLIENT_ID 2

/*
* MEI device IDs
Expand Down
6 changes: 6 additions & 0 deletions trunk/drivers/misc/mei/mei_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ extern const u8 mei_wd_state_independence_msg[3][4];
*/
#define MEI_MAX_OPEN_HANDLE_COUNT (MEI_CLIENTS_MAX - 3)

/*
* Internal Clients Number
*/
#define MEI_WD_HOST_CLIENT_ID 1
#define MEI_IAMTHIF_HOST_CLIENT_ID 2


/* File state */
enum file_state {
Expand Down

0 comments on commit 67cca99

Please sign in to comment.