diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-16 00:23:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-16 00:23:54 +0100 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/acpi/proc.c | |
| parent | net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| download | linux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.tar.xz linux-4961e02f1999e1c3468c09b2669c94d7c3ae82a8.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/acpi/proc.c')
| -rw-r--r-- | drivers/acpi/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index d0d25e2e1ced..1ac678d2c51c 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -435,7 +435,7 @@ acpi_system_write_wakeup_device(struct file *file, found_dev->wakeup.gpe_device)) { printk(KERN_WARNING "ACPI: '%s' and '%s' have the same GPE, " - "can't disable/enable one seperately\n", + "can't disable/enable one separately\n", dev->pnp.bus_id, found_dev->pnp.bus_id); dev->wakeup.state.enabled = found_dev->wakeup.state.enabled; |