diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
| commit | 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch) | |
| tree | 158cd337307a4a4e09a3fb5110f29ab0136bef6c /include/linux/key.h | |
| parent | ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts (diff) | |
| parent | MFD: ucb1x00-ts: fix resume failure (diff) | |
| download | linux-dev-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.tar.xz linux-dev-9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf.zip | |
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index bfc014c57351..5253471cd2ea 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -271,7 +271,7 @@ extern int keyring_add_key(struct key *keyring, extern struct key *key_lookup(key_serial_t id); -static inline key_serial_t key_serial(struct key *key) +static inline key_serial_t key_serial(const struct key *key) { return key ? key->serial : 0; } |