Commit 7c27fd19 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'sony-laptop' into release

parents 336d63b8 16dd55f3
...@@ -165,6 +165,7 @@ config SONY_LAPTOP ...@@ -165,6 +165,7 @@ config SONY_LAPTOP
depends on ACPI depends on ACPI
select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
depends on INPUT depends on INPUT
depends on RFKILL
---help--- ---help---
This mini-driver drives the SNC and SPIC devices present in the ACPI This mini-driver drives the SNC and SPIC devices present in the ACPI
BIOS of the Sony Vaio laptops. BIOS of the Sony Vaio laptops.
......
This diff is collapsed.
...@@ -103,6 +103,14 @@ ...@@ -103,6 +103,14 @@
#define SONYPI_EVENT_WIRELESS_OFF 61 #define SONYPI_EVENT_WIRELESS_OFF 61
#define SONYPI_EVENT_ZOOM_IN_PRESSED 62 #define SONYPI_EVENT_ZOOM_IN_PRESSED 62
#define SONYPI_EVENT_ZOOM_OUT_PRESSED 63 #define SONYPI_EVENT_ZOOM_OUT_PRESSED 63
#define SONYPI_EVENT_CD_EJECT_PRESSED 64
#define SONYPI_EVENT_MODEKEY_PRESSED 65
#define SONYPI_EVENT_PKEY_P4 66
#define SONYPI_EVENT_PKEY_P5 67
#define SONYPI_EVENT_SETTINGKEY_PRESSED 68
#define SONYPI_EVENT_VOLUME_INC_PRESSED 69
#define SONYPI_EVENT_VOLUME_DEC_PRESSED 70
#define SONYPI_EVENT_BRIGHTNESS_PRESSED 71
/* get/set brightness */ /* get/set brightness */
#define SONYPI_IOCGBRT _IOR('v', 0, __u8) #define SONYPI_IOCGBRT _IOR('v', 0, __u8)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment