diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-19 03:30:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-19 03:30:39 -0400 |
| commit | 407d819cf0fd54c6fc1138a509225696aecafd15 (patch) | |
| tree | b653a5c8c09f7c316f5f98947be262e27a4ca33a /fs/compat_ioctl.c | |
| parent | 7abbcd6a4c8d6179121f2915a761b1133bf1cd99 (diff) | |
| parent | b1235d79611e78a07629b4cbe53291c9cffd1834 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'fs/compat_ioctl.c')
| -rw-r--r-- | fs/compat_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index ddefb8851a98..7b3a03c7c6a9 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
| @@ -2346,6 +2346,7 @@ COMPATIBLE_IOCTL(HCIGETDEVLIST) | |||
| 2346 | COMPATIBLE_IOCTL(HCIGETDEVINFO) | 2346 | COMPATIBLE_IOCTL(HCIGETDEVINFO) |
| 2347 | COMPATIBLE_IOCTL(HCIGETCONNLIST) | 2347 | COMPATIBLE_IOCTL(HCIGETCONNLIST) |
| 2348 | COMPATIBLE_IOCTL(HCIGETCONNINFO) | 2348 | COMPATIBLE_IOCTL(HCIGETCONNINFO) |
| 2349 | COMPATIBLE_IOCTL(HCIGETAUTHINFO) | ||
| 2349 | COMPATIBLE_IOCTL(HCISETRAW) | 2350 | COMPATIBLE_IOCTL(HCISETRAW) |
| 2350 | COMPATIBLE_IOCTL(HCISETSCAN) | 2351 | COMPATIBLE_IOCTL(HCISETSCAN) |
| 2351 | COMPATIBLE_IOCTL(HCISETAUTH) | 2352 | COMPATIBLE_IOCTL(HCISETAUTH) |