diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-29 17:46:11 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-29 17:46:11 +1100 |
| commit | b8fcc83e9714d86d06633d5600c055f82904cff3 (patch) | |
| tree | 7fefe5f92a830a87399047f5de79a906eb58280f /drivers/staging/slicoss/slic.h | |
| parent | d0d0a1b1176de4b81b85fb284658662858002af5 (diff) | |
| parent | a4f6c31c9543e02a949c1d623f3f84f1e4c88cb5 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/slicoss/slic.h')
| -rw-r--r-- | drivers/staging/slicoss/slic.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h index ccf7625b8bb3..eb3a619c6a94 100644 --- a/drivers/staging/slicoss/slic.h +++ b/drivers/staging/slicoss/slic.h @@ -527,15 +527,6 @@ struct adapter { (largestat) += ((newstat) - (oldstat)); \ } -#define ETHER_EQ_ADDR(_AddrA, _AddrB, _Result) \ -{ \ - _Result = true; \ - if (*(u32 *)(_AddrA) != *(u32 *)(_AddrB)) \ - _Result = false; \ - if (*(u16 *)(&((_AddrA)[4])) != *(u16 *)(&((_AddrB)[4]))) \ - _Result = false; \ -} - #if defined(CONFIG_X86_64) || defined(CONFIG_IA64) #define SLIC_GET_ADDR_LOW(_addr) (u32)((u64)(_addr) & \ 0x00000000FFFFFFFF) |