diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/devfsd.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/devfsd.c')
| -rw-r--r-- | miscutils/devfsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 8f19288cc..35e431951 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
| @@ -75,7 +75,7 @@ | |||
| 75 | 75 | ||
| 76 | /* Various defines taken from linux/devfs_fs.h */ | 76 | /* Various defines taken from linux/devfs_fs.h */ |
| 77 | #define DEVFSD_PROTOCOL_REVISION_KERNEL 5 | 77 | #define DEVFSD_PROTOCOL_REVISION_KERNEL 5 |
| 78 | #define DEVFSD_IOCTL_BASE 'd' | 78 | #define DEVFSD_IOCTL_BASE 'd' |
| 79 | /* These are the various ioctls */ | 79 | /* These are the various ioctls */ |
| 80 | #define DEVFSDIOC_GET_PROTO_REV _IOR(DEVFSD_IOCTL_BASE, 0, int) | 80 | #define DEVFSDIOC_GET_PROTO_REV _IOR(DEVFSD_IOCTL_BASE, 0, int) |
| 81 | #define DEVFSDIOC_SET_EVENT_MASK _IOW(DEVFSD_IOCTL_BASE, 2, int) | 81 | #define DEVFSDIOC_SET_EVENT_MASK _IOW(DEVFSD_IOCTL_BASE, 2, int) |