diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 17:17:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 17:17:40 -0400 |
| commit | d06e7a56d91328267a96b1a4df4ede7529f829e8 (patch) | |
| tree | b8034a35c50986d93cb7c0f691f9471bc27b74d1 /include/linux | |
| parent | 346fced899c7390e555cf90cd07d1e56b460d21b (diff) | |
| parent | 864ae180074931f3a28c84ea85aa8cfeca18bc4f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compat_ioctl.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/linux/compat_ioctl.h b/include/linux/compat_ioctl.h index 70a4ebb5d964..ecb0d39c0798 100644 --- a/include/linux/compat_ioctl.h +++ b/include/linux/compat_ioctl.h | |||
| @@ -346,10 +346,27 @@ COMPATIBLE_IOCTL(PPPOEIOCDFWD) | |||
| 346 | /* LP */ | 346 | /* LP */ |
| 347 | COMPATIBLE_IOCTL(LPGETSTATUS) | 347 | COMPATIBLE_IOCTL(LPGETSTATUS) |
| 348 | /* ppdev */ | 348 | /* ppdev */ |
| 349 | COMPATIBLE_IOCTL(PPSETMODE) | ||
| 350 | COMPATIBLE_IOCTL(PPRSTATUS) | ||
| 351 | COMPATIBLE_IOCTL(PPRCONTROL) | ||
| 352 | COMPATIBLE_IOCTL(PPWCONTROL) | ||
| 353 | COMPATIBLE_IOCTL(PPFCONTROL) | ||
| 354 | COMPATIBLE_IOCTL(PPRDATA) | ||
| 355 | COMPATIBLE_IOCTL(PPWDATA) | ||
| 349 | COMPATIBLE_IOCTL(PPCLAIM) | 356 | COMPATIBLE_IOCTL(PPCLAIM) |
| 350 | COMPATIBLE_IOCTL(PPRELEASE) | 357 | COMPATIBLE_IOCTL(PPRELEASE) |
| 351 | COMPATIBLE_IOCTL(PPEXCL) | ||
| 352 | COMPATIBLE_IOCTL(PPYIELD) | 358 | COMPATIBLE_IOCTL(PPYIELD) |
| 359 | COMPATIBLE_IOCTL(PPEXCL) | ||
| 360 | COMPATIBLE_IOCTL(PPDATADIR) | ||
| 361 | COMPATIBLE_IOCTL(PPNEGOT) | ||
| 362 | COMPATIBLE_IOCTL(PPWCTLONIRQ) | ||
| 363 | COMPATIBLE_IOCTL(PPCLRIRQ) | ||
| 364 | COMPATIBLE_IOCTL(PPSETPHASE) | ||
| 365 | COMPATIBLE_IOCTL(PPGETMODES) | ||
| 366 | COMPATIBLE_IOCTL(PPGETMODE) | ||
| 367 | COMPATIBLE_IOCTL(PPGETPHASE) | ||
| 368 | COMPATIBLE_IOCTL(PPGETFLAGS) | ||
| 369 | COMPATIBLE_IOCTL(PPSETFLAGS) | ||
| 353 | /* CDROM stuff */ | 370 | /* CDROM stuff */ |
| 354 | COMPATIBLE_IOCTL(CDROMPAUSE) | 371 | COMPATIBLE_IOCTL(CDROMPAUSE) |
| 355 | COMPATIBLE_IOCTL(CDROMRESUME) | 372 | COMPATIBLE_IOCTL(CDROMRESUME) |