diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
| commit | ba4ccd8831a8174e533cb02d03134a512e4ea79b (patch) | |
| tree | b3be2e92ab11ef568ff5ccba47989e6d5950222c /drivers/staging/vt6655/tkip.c | |
| parent | c23553f91afc3d030b45bfbf637a08698558ff9b (diff) | |
| parent | a6ab2b64c43054920f41332ab12e853997d467cf (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/vt6655/tkip.c')
| -rw-r--r-- | drivers/staging/vt6655/tkip.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/staging/vt6655/tkip.c b/drivers/staging/vt6655/tkip.c index 2ded8420c390..8ca154080e98 100644 --- a/drivers/staging/vt6655/tkip.c +++ b/drivers/staging/vt6655/tkip.c @@ -32,20 +32,8 @@ * */ - -#if !defined(__TMACRO_H__) #include "tmacro.h" -#endif -#if !defined(__TBIT_H__) -#include "tbit.h" -#endif -#if !defined(__TKIP_H__) #include "tkip.h" -#endif -#if !defined(__UMEM_H__) -#include "umem.h" -#endif - /*--------------------- Static Definitions -------------------------*/ |