Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[pandora-kernel.git] / drivers / staging / brcm80211 / include / linuxver.h

diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h
index 190bdee..dc72141 100644 (file)
--- a/drivers/staging/brcm80211/include/linuxver.h
+++ b/drivers/staging/brcm80211/include/linuxver.h
@@ -17,11 +17,8 @@
 #ifndef _linuxver_h_
 #define _linuxver_h_
 
-#include <linux/version.h>
 #include <linux/module.h>
-
 #include <linux/slab.h>
-
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/mm.h>
@@ -29,58 +26,13 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
-#undef IP_TOS
-#include <asm/io.h>
-
 #include <linux/workqueue.h>
-
-typedef irqreturn_t(*FN_ISR) (int irq, void *dev_id, struct pt_regs * ptregs);
-
 #include <linux/sched.h>
 #include <linux/ieee80211.h>
-
-#ifndef __exit
-#define __exit
-#endif
-#ifndef __devexit
-#define __devexit
-#endif
-#ifndef __devinit
-#define __devinit      __init
-#endif
-#ifndef __devinitdata
-#define __devinitdata
-#endif
-#ifndef __devexit_p
-#define __devexit_p(x) x
-#endif
-
-#define pci_module_init pci_register_driver
-
-#define netif_down(dev)
-
-/* Power management related macro & routines */
-#define        PCI_SAVE_STATE(a, b)    pci_save_state(a)
-#define        PCI_RESTORE_STATE(a, b) pci_restore_state(a)
-
-/* suspend args */
-#define DRV_SUSPEND_STATE_TYPE pm_message_t
-
-#define CHECKSUM_HW    CHECKSUM_PARTIAL
-
 #include <linux/time.h>
 #include <linux/wait.h>
 
-#define KILL_PROC(nr, sig) \
-       do { \
-               struct task_struct *tsk; \
-               struct pid *pid;    \
-               pid = find_get_pid((pid_t)nr);    \
-               tsk = pid_task(pid, PIDTYPE_PID);    \
-               if (tsk) \
-                       send_sig(sig, tsk, 1); \
-       } while (0)
-
-#define WL_DEV_IF(dev)          ((wl_if_t *)netdev_priv(dev))
+#undef IP_TOS
+#include <asm/io.h>
 
 #endif                         /* _linuxver_h_ */