diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 18:34:14 -0400 |
| commit | 38a6ed3ed8e108b662f4016a1ebf068dcf4c1ef4 (patch) | |
| tree | a83d5e4e86edf6cb2de22db6f2ff2274753a2bab /include/linux/smsc911x.h | |
| parent | f2d28a2ebcb525a6ec7e2152106ddb385ef52b73 (diff) | |
| parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
Merge branch 'linus' into core/printk
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__ */ |