aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2008-08-28 13:25:21 -0400
committerAndi Kleen <ak@linux.intel.com>2008-08-28 13:25:21 -0400
commit9d5e88bcdd8d814a65dfeb6b55a5a7cef61630d4 (patch)
tree34b174bbb23518864c5555938d0cafe4fcd89d86 /drivers/misc
parent4eb57c98b8d2a812441b33911ca3cf9602699654 (diff)
parent9662e0802445a1f56cef11bbd0d520b07238424a (diff)
Merge branch 'wan' into release-2.6.27
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/thinkpad_acpi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index d3eb7903c34..6b9300779a4 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/*************************************************************************