diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/input/ff.txt | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/input/ff.txt')
-rw-r--r-- | Documentation/input/ff.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt index ded4d5f53109..b3867bf49f8f 100644 --- a/Documentation/input/ff.txt +++ b/Documentation/input/ff.txt | |||
@@ -49,7 +49,9 @@ This information is subject to change. | |||
49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
50 | #include <sys/ioctl.h> | 50 | #include <sys/ioctl.h> |
51 | 51 | ||
52 | unsigned long features[1 + FF_MAX/sizeof(unsigned long)]; | 52 | #define BITS_TO_LONGS(x) \ |
53 | (((x) + 8 * sizeof (unsigned long) - 1) / (8 * sizeof (unsigned long))) | ||
54 | unsigned long features[BITS_TO_LONGS(FF_CNT)]; | ||
53 | int ioctl(int file_descriptor, int request, unsigned long *features); | 55 | int ioctl(int file_descriptor, int request, unsigned long *features); |
54 | 56 | ||
55 | "request" must be EVIOCGBIT(EV_FF, size of features array in bytes ) | 57 | "request" must be EVIOCGBIT(EV_FF, size of features array in bytes ) |