git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
[pandora-kernel.git]
/
include
/
linux
/
input.h
diff --git
a/include/linux/input.h
b/include/linux/input.h
index
7ed2251
..
6fcc910
100644
(file)
--- a/
include/linux/input.h
+++ b/
include/linux/input.h
@@
-806,6
+806,7
@@
struct input_absinfo {
#define BUS_HOST 0x19
#define BUS_GSC 0x1A
#define BUS_ATARI 0x1B
#define BUS_HOST 0x19
#define BUS_GSC 0x1A
#define BUS_ATARI 0x1B
+#define BUS_SPI 0x1C
/*
* MT_TOOL types
/*
* MT_TOOL types
@@
-1154,7
+1155,7
@@
struct input_dev {
int sync;
int sync;
- int abs[ABS_
MAX + 1
];
+ int abs[ABS_
CNT
];
int rep[REP_MAX + 1];
unsigned long key[BITS_TO_LONGS(KEY_CNT)];
int rep[REP_MAX + 1];
unsigned long key[BITS_TO_LONGS(KEY_CNT)];
@@
-1162,11
+1163,11
@@
struct input_dev {
unsigned long snd[BITS_TO_LONGS(SND_CNT)];
unsigned long sw[BITS_TO_LONGS(SW_CNT)];
unsigned long snd[BITS_TO_LONGS(SND_CNT)];
unsigned long sw[BITS_TO_LONGS(SW_CNT)];
- int absmax[ABS_
MAX + 1
];
- int absmin[ABS_
MAX + 1
];
- int absfuzz[ABS_
MAX + 1
];
- int absflat[ABS_
MAX + 1
];
- int absres[ABS_
MAX + 1
];
+ int absmax[ABS_
CNT
];
+ int absmin[ABS_
CNT
];
+ int absfuzz[ABS_
CNT
];
+ int absflat[ABS_
CNT
];
+ int absres[ABS_
CNT
];
int (*open)(struct input_dev *dev);
void (*close)(struct input_dev *dev);
int (*open)(struct input_dev *dev);
void (*close)(struct input_dev *dev);