diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /security/security.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 3ef5e2a7a741..1b798d3df710 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -197,9 +197,9 @@ int security_quota_on(struct dentry *dentry) | |||
| 197 | return security_ops->quota_on(dentry); | 197 | return security_ops->quota_on(dentry); |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | int security_syslog(int type, bool from_file) | 200 | int security_syslog(int type) |
| 201 | { | 201 | { |
| 202 | return security_ops->syslog(type, from_file); | 202 | return security_ops->syslog(type); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | int security_settime(struct timespec *ts, struct timezone *tz) | 205 | int security_settime(struct timespec *ts, struct timezone *tz) |