diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-02 20:09:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-02 20:09:50 +0100 |
| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /drivers/hwmon | |
| parent | 1c39194878c09bd88ffc9c9d4c2f01c3397c7aed (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
| download | talos-op-linux-a64d31baed104be25305e9c71585d3ea4ee9a418.tar.gz talos-op-linux-a64d31baed104be25305e9c71585d3ea4ee9a418.zip | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/applesmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index f7dce8b9f64b..086c2a5cef0b 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -1564,3 +1564,4 @@ module_exit(applesmc_exit); MODULE_AUTHOR("Nicolas Boichat"); MODULE_DESCRIPTION("Apple SMC"); MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(dmi, applesmc_whitelist); |
