From 4ff379a06a70e17997e196c9c393bc7c8648e42a Mon Sep 17 00:00:00 2001 From: merge Date: Fri, 16 Jan 2009 11:23:28 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-rfkill-support-for-the-ar6000-1232104308 pending-tracking-hist top was MERGE-via-stable-tracking-rfkill-support-for-the-ar6000-1232104308 / 09faeb511e9e6872c79b4d1ea2f3b5fefc16f3a1 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-rfkill-support-for-the-ar6000- stable-tracking-hist top was rfkill-support-for-the-ar6000- / e82f8ffa04ebcb05506c8e22268371c3c3b03173 ... parent commitmessage: From: Werner Almesberger rfkill support for the AR6000 driver This patch adds rfkill support to the AR6000 driver. The driver does not directly implement an rfkill device but uses the help of a special platform device, such that the latter can retain rfkill state when the AR6k driver is removed (e.g., because of suspend). If an attempt is made to bring the driver up (module load, bind, or resume) while rfkill is blocking, only the driver's data structures are initialized, but function activation and most of the rest of the setup is deferred until the rfkill block is removed. Signed-off-by: Werner Almesberger --- arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/mach-s3c2410') diff --git a/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h b/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h index 8e4ccf241fc..5a224fe036b 100644 --- a/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h +++ b/arch/arm/mach-s3c2410/include/mach/gta02-pm-wlan.h @@ -1 +1,10 @@ +#ifndef __MACH_GTA02_PM_WLAN_H +#define __MACH_GTA02_PM_WLAN_H + void gta02_wlan_power(int on); +int gta02_wlan_query_rfkill_lock(void); +void gta02_wlan_query_rfkill_unlock(void); +void gta02_wlan_set_rfkill_cb(int (*cb)(void *user, int on), void *user); +void gta02_wlan_clear_rfkill_cb(void); + +#endif /* __MACH_GTA02_PM_WLAN_H */ -- cgit v1.2.3