[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 34152a920a7e529ba65ded0a8024492026e68356
Author: Werner Almesberger <werner at openmoko.org>
Date:   Tue Mar 31 04:47:06 2009 -0300

    AR6000: support GTA02-specific rfkill only if building for GTA02
    
    This is loosely based on a patch by Ivan Petrov.
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>
    Reported-by: Ivan Petrov <ivan_p at hotbox.ru>

diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index 56981af..386d96e 100644
--- a/drivers/ar6000/hif/hif2.c
+++ b/drivers/ar6000/hif/hif2.c
@@ -26,13 +26,28 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/mmc/sdio.h>
 #include <linux/mmc/sdio_ids.h>
-#include <mach/gta02-pm-wlan.h>
 
 #include "athdefs.h"
 #include "a_types.h"
 #include "hif.h"
 
 
+/* @@@ Hack - this wants cleaning up */
+
+#ifdef CONFIG_MACH_NEO1973_GTA02
+
+#include <mach/gta02-pm-wlan.h>
+
+#else /* CONFIG_MACH_NEO1973_GTA02 */
+
+#define	gta02_wlan_query_rfkill_lock()  1
+#define	gta02_wlan_set_rfkill_cb(cb, hif) ((void) cb)
+#define	gta02_wlan_query_rfkill_unlock()
+#define	gta02_wlan_clear_rfkill_cb()
+
+#endif /* !CONFIG_MACH_NEO1973_GTA02 */
+
+
 /*
  * KNOWN BUGS:
  *

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko