diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-27 12:20:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-27 12:20:15 +1000 |
| commit | dde4b2d19e8177d6156b3f0654f2bdeea6eec3d4 (patch) | |
| tree | 2b5b5efa058d98ebb623dc8ff90002111f145e68 /include | |
| parent | 965f49fc1cc0a72164bf2c6536e861140abc5fb3 (diff) | |
| parent | 96822ad68720bd1e59831a9c0918b49be983dbdd (diff) | |
Merge branch 'quilt/i2c'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 57d41b0abce2..060fcf278458 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -338,8 +338,7 @@ struct i2c_adapter { void *algo_data; /* data fields that are valid for all devices */ - u8 level; /* nesting level for lockdep */ - struct mutex bus_lock; + struct rt_mutex bus_lock; int timeout; /* in jiffies */ int retries; |