diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 03:09:51 -0400 |
| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /drivers/misc/thinkpad_acpi.c | |
| parent | ab7476cf76e560f0efda2a631a70aabe93009025 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index d3eb7903c346..6b9300779a43 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -3086,7 +3086,6 @@ static struct ibm_struct wan_driver_data = { | |||
| 3086 | .read = wan_read, | 3086 | .read = wan_read, |
| 3087 | .write = wan_write, | 3087 | .write = wan_write, |
| 3088 | .exit = wan_exit, | 3088 | .exit = wan_exit, |
| 3089 | .flags.experimental = 1, | ||
| 3090 | }; | 3089 | }; |
| 3091 | 3090 | ||
| 3092 | /************************************************************************* | 3091 | /************************************************************************* |