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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
drivers
/
acpi
/
toshiba_acpi.c
diff --git
a/drivers/acpi/toshiba_acpi.c
b/drivers/acpi/toshiba_acpi.c
index
9e8c20c
..
0a43c8e
100644
(file)
--- a/
drivers/acpi/toshiba_acpi.c
+++ b/
drivers/acpi/toshiba_acpi.c
@@
-99,6
+99,13
@@
MODULE_LICENSE("GPL");
#define HCI_VIDEO_OUT_CRT 0x2
#define HCI_VIDEO_OUT_TV 0x4
+static const struct acpi_device_id toshiba_device_ids[] = {
+ {"TOS6200", 0},
+ {"TOS1900", 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, toshiba_device_ids);
+
/* utility
*/