diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /security/security.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.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) |