diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 01:24:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-17 01:24:49 -0400 |
| commit | c2f828977ba5d17c13debba374ea252d18e5ccfb (patch) | |
| tree | 49d95c5e9325f93f379e5c249bf5a39f8e8040ae /drivers/misc/thinkpad_acpi.h | |
| parent | 6553daeafb4fa15cd07088f543352fa3779e86e1 (diff) | |
| parent | ecfe7f093768f7af0959f5be8ec039dcc29724af (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: thinkpad-acpi: bump up version to 0.16
ACPI: thinkpad-acpi: revert new 2.6.23 CONFIG_THINKPAD_ACPI_INPUT_ENABLED option
ACPI: fix CONFIG_NET=n acpi_bus_generate_netlink_event build failure
msi-laptop: replace ',' with ';'
ACPI: (more) delete CONFIG_ACPI_PROCFS_SLEEP (again)
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h index eee8809a50d9..082a1cbc16c0 100644 --- a/drivers/misc/thinkpad_acpi.h +++ b/drivers/misc/thinkpad_acpi.h | |||
| @@ -181,6 +181,7 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv); | |||
| 181 | static int experimental; | 181 | static int experimental; |
| 182 | static u32 dbg_level; | 182 | static u32 dbg_level; |
| 183 | static int force_load; | 183 | static int force_load; |
| 184 | static unsigned int hotkey_report_mode; | ||
| 184 | 185 | ||
| 185 | static int thinkpad_acpi_module_init(void); | 186 | static int thinkpad_acpi_module_init(void); |
| 186 | static void thinkpad_acpi_module_exit(void); | 187 | static void thinkpad_acpi_module_exit(void); |