diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-30 23:08:33 -0400 |
| commit | 930861c4e6f13ce2e7d06cd1ef11441a065517d9 (patch) | |
| tree | df6ff01f89768ff8d6fe6a64491be30e6e56c3e0 /include/linux/smsc911x.h | |
| parent | 8b112171734c791afaf43ccc8c6ec492e7006e44 (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/smsc911x.h')
| -rw-r--r-- | include/linux/smsc911x.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h index 1cbf0313adde..b32725075d71 100644 --- a/include/linux/smsc911x.h +++ b/include/linux/smsc911x.h | |||
| @@ -43,5 +43,8 @@ struct smsc911x_platform_config { | |||
| 43 | /* Constants for flags */ | 43 | /* Constants for flags */ |
| 44 | #define SMSC911X_USE_16BIT (BIT(0)) | 44 | #define SMSC911X_USE_16BIT (BIT(0)) |
| 45 | #define SMSC911X_USE_32BIT (BIT(1)) | 45 | #define SMSC911X_USE_32BIT (BIT(1)) |
| 46 | #define SMSC911X_FORCE_INTERNAL_PHY (BIT(2)) | ||
| 47 | #define SMSC911X_FORCE_EXTERNAL_PHY (BIT(3)) | ||
| 48 | #define SMSC911X_SAVE_MAC_ADDRESS (BIT(4)) | ||
| 46 | 49 | ||
| 47 | #endif /* __LINUX_SMSC911X_H__ */ | 50 | #endif /* __LINUX_SMSC911X_H__ */ |