Merge branch 'for-linus' into next

Conflicts:

	drivers/input/mouse/appletouch.c
This commit is contained in:
Dmitry Torokhov 2008-06-17 12:02:44 -04:00
commit 15439dd37f
13 changed files with 161 additions and 55 deletions

View file

@ -639,7 +639,9 @@ struct input_absinfo {
#define SW_LID 0x00 /* set = lid shut */
#define SW_TABLET_MODE 0x01 /* set = tablet mode */
#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */
#define SW_RADIO 0x03 /* set = radio enabled */
#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any"
set = radio enabled */
#define SW_RADIO SW_RFKILL_ALL /* deprecated */
#define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1)