--- h5400_wifi.c.orig	2008-03-28 00:31:20.000000000 +0100
+++ h5400_wifi.c	2008-03-28 00:32:39.000000000 +0100
@@ -21,110 +21,42 @@
  */
 
 #include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/version.h>
-#include <linux/init.h>
 #include <linux/device.h>
-#include <linux/usb.h>
-#include <linux/slab.h>
-#define CONFIG_PCI
-#include <linux/pci.h> /* pci_pool defs */
 #include <linux/leds.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/irq.h>
-
 #include <asm/arch-pxa/h5400.h>
 #include <asm/arch-pxa/h5400-asic.h>
-
-#include <linux/soc/samcop_base.h>
-
-typedef struct ohci ohci_t;
-
-extern int hc_add_ohci(struct pci_dev *dev, int irq, void *mem_base, unsigned long flags,
-				 ohci_t **ohci, const char *name, const char *slot_name);
-extern void hc_remove_ohci(ohci_t *ohci);
+#include <linux/mfd/samcop_base.h>
 
 static void 
-h5400_ohci_remove (struct device *dev)
+h5400_wifi_remove (void)
 {
-#if 0
-#warning port to kernel 2.6
-	if (dev->driver_data) {
-		hc_remove_ohci (dev->driver_data);
-		dev->driver_data = NULL;
-	}
-#endif
-
-	samcop_set_gpio_b (dev->parent, SAMCOP_GPIO_GPB_RF_POWER_ON | SAMCOP_GPIO_GPB_WLAN_POWER_ON, 0);
-	led_trigger_event_shared(h5400_radio_trig, LED_OFF);
+	printk("h5400_wlan_remove\n");
+	samcop_set_gpio_b (&h5400_samcop.dev, SAMCOP_GPIO_GPB_RF_POWER_ON | SAMCOP_GPIO_GPB_WLAN_POWER_ON, 0);
+	led_trigger_event_shared(h5400_wifi_trig, LED_OFF);
 }
 
-static int 
-h5400_ohci_probe (struct device *dev)
+static void 
+h5400_wifi_start (void)
 {
-	struct platform_device *sdev;
-	int irq;
-	void *mem_base;
-	unsigned long flags = 0;
-	int result = 0;
-
-	sdev = to_platform_device (dev);
-	mem_base = (void *)sdev->resource[1].start;
-	irq = sdev->resource[2].start;
-
-	/* make sure the clocks are enabled */
-	samcop_clock_enable (dev->parent, SAMCOP_CPM_CLKCON_USBHOST_CLKEN, 1);
-	samcop_clock_enable (dev->parent, SAMCOP_CPM_CLKCON_UCLK_EN, 0);
-
+	printk("h5400_wlan_start\n");
 	/* both needed? */
-	samcop_set_gpio_b (dev->parent, SAMCOP_GPIO_GPB_RF_POWER_ON | SAMCOP_GPIO_GPB_WLAN_POWER_ON, 
+	samcop_set_gpio_b (&h5400_samcop.dev, SAMCOP_GPIO_GPB_RF_POWER_ON | SAMCOP_GPIO_GPB_WLAN_POWER_ON, 
 			   SAMCOP_GPIO_GPB_RF_POWER_ON | SAMCOP_GPIO_GPB_WLAN_POWER_ON);
 
-	led_trigger_event_shared(h5400_radio_trig, LED_FULL);
-#if 0
-#warning port to kernel 2.6
-	msleep (100);
-
-	result = hc_add_ohci (pcidev, irq, mem_base, flags, (ohci_t **)&dev->driver_data, "h5400-ohci", "asic");
-	if (result)
-		h5400_ohci_remove (dev);
-#endif
-
-	return result;
-}
+	led_trigger_event_shared(h5400_wifi_trig, LED_FULL);
+}	
 
-static int
-h5400_ohci_suspend (struct device *dev, pm_message_t msg)
+static void __init h5400_wifi_init(void)
 {
-	return 0;
+	return h5400_wifi_start();
+	
 }
-
-static int
-h5400_ohci_resume (struct device *dev)
-{
-	return 0;
-}
-
-struct device_driver h5400_usb_device_driver = {
-	.name     = "h5400 wifi",
-	.probe    = h5400_ohci_probe,
-	.shutdown = h5400_ohci_remove,
-	.suspend  = h5400_ohci_suspend,
-	.resume   = h5400_ohci_resume
-};
-
-static int __init
-h5400_ohci_init (void)
-{
-	return driver_register (&h5400_usb_device_driver);
-}
-
-static void __exit
-h5400_ohci_exit (void)
+static void __exit h5400_wifi_exit(void)
 {
-	driver_unregister (&h5400_usb_device_driver);
+	return h5400_wifi_remove();
 }
 
-module_init(h5400_ohci_init);
-module_exit(h5400_ohci_exit);
+module_init(h5400_wifi_init);
+module_exit(h5400_wifi_exit);
+MODULE_LICENSE("GPL");