diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-24 01:19:00 -0500 |
| commit | fcb11235d3910c39afece52f6e106a9ca565d34b (patch) | |
| tree | 07412f9c367f5f9bf6ad7ccd6fa8146c4aba68af /drivers/platform/x86/msi-wmi.c | |
| parent | 78a5331dddcffabadef024ccc051f7a519b13238 (diff) | |
| parent | 44ef00e6482e755f36629773abc2aee83a6f53e3 (diff) | |
| download | op-kernel-dev-fcb11235d3910c39afece52f6e106a9ca565d34b.zip op-kernel-dev-fcb11235d3910c39afece52f6e106a9ca565d34b.tar.gz | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/platform/x86/msi-wmi.c')
| -rw-r--r-- | drivers/platform/x86/msi-wmi.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index 0c8fe14..7f77f90 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c @@ -34,16 +34,6 @@ MODULE_LICENSE("GPL"); MODULE_ALIAS("wmi:551A1F84-FBDD-4125-91DB-3EA8F44F1D45"); MODULE_ALIAS("wmi:B6F3EEF2-3D2F-49DC-9DE3-85BCE18C62F2"); -/* Temporary workaround until the WMI sysfs interface goes in - { "svn", DMI_SYS_VENDOR }, - { "pn", DMI_PRODUCT_NAME }, - { "pvr", DMI_PRODUCT_VERSION }, - { "rvn", DMI_BOARD_VENDOR }, - { "rn", DMI_BOARD_NAME }, -*/ - -MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-6638:*"); - #define DRV_NAME "msi-wmi" #define DRV_PFX DRV_NAME ": " |
