diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-16 23:52:41 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-16 23:52:41 (GMT) |
| commit | 81450b73dde07f473a4a7208b209b4c8b7251d90 (patch) | |
| tree | 94e676c74c32f2a74dc306cf863d7e190777f2ab /drivers/acpi/asus_acpi.c | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
| parent | 0539771d7236b425f285652f6f297cc7939c8f9a (diff) | |
| download | linux-fsl-qoriq-81450b73dde07f473a4a7208b209b4c8b7251d90.tar.xz | |
Pull misc-for-upstream into release branch
Conflicts:
drivers/usb/misc/appledisplay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/asus_acpi.c')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 31ad70a..fa19a6c 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -141,6 +141,7 @@ struct asus_hotk { W5A, //W5A W3V, //W3030V xxN, //M2400N, M3700N, M5200N, M6800N, S1300N, S5200N + A4S, //Z81sp //(Centrino) END_MODEL } model; //Models currently supported @@ -397,7 +398,16 @@ static struct model_data model_conf[END_MODEL] = { .brightness_set = "SPLV", .brightness_get = "GPLV", .display_set = "SDSP", - .display_get = "\\ADVG"} + .display_get = "\\ADVG"}, + + { + .name = "A4S", + .brightness_set = "SPLV", + .brightness_get = "GPLV", + .mt_bt_switch = "BLED", + .mt_wled = "WLED" + } + }; /* procdir we use */ @@ -1117,6 +1127,8 @@ static int asus_model_match(char *model) return W3V; else if (strncmp(model, "W5A", 3) == 0) return W5A; + else if (strncmp(model, "A4S", 3) == 0) + return A4S; else return END_MODEL; } |