Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[linux-beck.git] / drivers / acpi / proc.c

diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
index d0d25e2e1cedf6b2296b951ebfc0f5a688243eb4..1ac678d2c51c691f2431882283b005578f8578bb 100644 (file)
--- 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;