X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=drivers%2Facpi%2Fbutton.c;h=171fd914f43533f46bf417dd4d4a7b6936fc6e50;hb=dd0910b3c71b253c08111110f0399b924a8d5853;hp=cb046c3fc3f2bd15da05dfd3939cda28d4949599;hpb=a5a64498c194c82ecad3a2d67cff6231cda8d3dd;p=linux-2.6-block.git

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index cb046c3fc3f2..171fd914f435 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -33,7 +33,6 @@
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
-#define ACPI_BUTTON_COMPONENT		0x00080000
 #define ACPI_BUTTON_CLASS		"button"
 #define ACPI_BUTTON_FILE_INFO		"info"
 #define ACPI_BUTTON_FILE_STATE		"state"
@@ -479,7 +478,7 @@ static int acpi_button_add(struct acpi_device *device)
 				  device->wakeup.gpe_number,
 				  ACPI_GPE_TYPE_WAKE_RUN);
 		acpi_enable_gpe(device->wakeup.gpe_device,
-				device->wakeup.gpe_number, ACPI_NOT_ISR);
+				device->wakeup.gpe_number);
 		device->wakeup.state.enabled = 1;
 	}