diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/ibmlana.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/ibmlana.h')
| -rw-r--r-- | drivers/net/ibmlana.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibmlana.h b/drivers/net/ibmlana.h index aa3ddbdee4bb..accd5efc9c8a 100644 --- a/drivers/net/ibmlana.h +++ b/drivers/net/ibmlana.h | |||
| @@ -90,7 +90,7 @@ typedef struct { | |||
| 90 | #define RCREG_ERR 0x8000 /* accept damaged and collided pkts */ | 90 | #define RCREG_ERR 0x8000 /* accept damaged and collided pkts */ |
| 91 | #define RCREG_RNT 0x4000 /* accept packets that are < 64 */ | 91 | #define RCREG_RNT 0x4000 /* accept packets that are < 64 */ |
| 92 | #define RCREG_BRD 0x2000 /* accept broadcasts */ | 92 | #define RCREG_BRD 0x2000 /* accept broadcasts */ |
| 93 | #define RCREG_PRO 0x1000 /* promiscous mode */ | 93 | #define RCREG_PRO 0x1000 /* promiscuous mode */ |
| 94 | #define RCREG_AMC 0x0800 /* accept all multicasts */ | 94 | #define RCREG_AMC 0x0800 /* accept all multicasts */ |
| 95 | #define RCREG_LB_NONE 0x0000 /* no loopback */ | 95 | #define RCREG_LB_NONE 0x0000 /* no loopback */ |
| 96 | #define RCREG_LB_MAC 0x0200 /* MAC loopback */ | 96 | #define RCREG_LB_MAC 0x0200 /* MAC loopback */ |