diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 05:15:40 -0400 |
| commit | 5e34437840d33554f69380584311743b39e8fbeb (patch) | |
| tree | e081135619ee146af5efb9ee883afca950df5757 /include/linux/smsc911x.h | |
| parent | 77d05632baee21b1cef8730d7c06aa69601e4dca (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/sysctl.c
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__ */ |