diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /drivers/ieee1394/ieee1394.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'drivers/ieee1394/ieee1394.h')
| -rw-r--r-- | drivers/ieee1394/ieee1394.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/ieee1394.h b/drivers/ieee1394/ieee1394.h index e0ae0d3d747f..af320e2c5079 100644 --- a/drivers/ieee1394/ieee1394.h +++ b/drivers/ieee1394/ieee1394.h | |||
| @@ -54,9 +54,7 @@ | |||
| 54 | #define IEEE1394_SPEED_800 0x03 | 54 | #define IEEE1394_SPEED_800 0x03 |
| 55 | #define IEEE1394_SPEED_1600 0x04 | 55 | #define IEEE1394_SPEED_1600 0x04 |
| 56 | #define IEEE1394_SPEED_3200 0x05 | 56 | #define IEEE1394_SPEED_3200 0x05 |
| 57 | 57 | #define IEEE1394_SPEED_MAX IEEE1394_SPEED_3200 | |
| 58 | /* The current highest tested speed supported by the subsystem */ | ||
| 59 | #define IEEE1394_SPEED_MAX IEEE1394_SPEED_800 | ||
| 60 | 58 | ||
| 61 | /* Maps speed values above to a string representation */ | 59 | /* Maps speed values above to a string representation */ |
| 62 | extern const char *hpsb_speedto_str[]; | 60 | extern const char *hpsb_speedto_str[]; |