From: Len Brown <len.brown@intel.com>
Date: Wed, 24 Jun 2009 05:22:20 +0000 (-0400)
Subject: Merge branch 'bjorn-notify' into release
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=57599cc997b81a7c4f764693a7316886a72067fe;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'bjorn-notify' into release

Conflicts:
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

57599cc997b81a7c4f764693a7316886a72067fe
diff --cc drivers/platform/x86/eeepc-laptop.c
index 8153b3e59189,1e28413060b2..46b5aa5e85f0
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@ -180,7 -180,7 +180,8 @@@ static struct key_entry eeepc_keymap[] 
   */
  static int eeepc_hotk_add(struct acpi_device *device);
  static int eeepc_hotk_remove(struct acpi_device *device, int type);
 +static int eeepc_hotk_resume(struct acpi_device *device);
+ static void eeepc_hotk_notify(struct acpi_device *device, u32 event);
  
  static const struct acpi_device_id eeepc_device_ids[] = {
  	{EEEPC_HOTK_HID, 0},
@@@ -195,7 -196,7 +197,8 @@@ static struct acpi_driver eeepc_hotk_dr
  	.ops = {
  		.add = eeepc_hotk_add,
  		.remove = eeepc_hotk_remove,
 +		.resume = eeepc_hotk_resume,
+ 		.notify = eeepc_hotk_notify,
  	},
  };
  
@@@ -547,18 -569,10 +550,18 @@@ static void eeepc_rfkill_hotplug(void
  		}
  	}
  
 -	rfkill_force_state(ehotk->eeepc_wlan_rfkill, state);
 +	rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill, blocked);
 +}
 +
 +static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
 +{
 +	if (event != ACPI_NOTIFY_BUS_CHECK)
 +		return;
 +
 +	eeepc_rfkill_hotplug();
  }
  
- static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
+ static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
  {
  	static struct key_entry *key;
  	u16 count;