diff options
author | Jesse Gilles <jgilles@multitech.com> | 2014-08-29 15:21:10 -0500 |
---|---|---|
committer | Jesse Gilles <jgilles@multitech.com> | 2014-08-29 15:21:10 -0500 |
commit | da1090a73f312b14db0d7a93a9c9373fffd34958 (patch) | |
tree | e2f125a1abc3bf72d56e38493b53750d7f8c8c61 /io-module/mts_eeprom.h | |
parent | 19a9fd0f6bb179fce8061b3080e93f94a37eeabe (diff) | |
parent | 19018dbbb35bd2940721ea6f04400a58c9644839 (diff) | |
download | mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.tar.gz mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.tar.bz2 mts-io-da1090a73f312b14db0d7a93a9c9373fffd34958.zip |
Merge branch 'master' of sw.multitech.prv:/git/jjg/cdp-io-controller
Conflicts:
io-module/mts_eeprom.h
io-module/mts_io.c
io-module/spi.c
Diffstat (limited to 'io-module/mts_eeprom.h')
-rw-r--r-- | io-module/mts_eeprom.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/io-module/mts_eeprom.h b/io-module/mts_eeprom.h index 811b380..2e42008 100644 --- a/io-module/mts_eeprom.h +++ b/io-module/mts_eeprom.h @@ -23,8 +23,8 @@ struct mts_id_eeprom_layout { uint8_t reserved[302]; }; -/* daughter/accessory card EEPROM */ -struct mts_dc_eeprom_layout { +/* accessory card EEPROM */ +struct mts_ap_eeprom_layout { char vendor_id[32]; char product_id[32]; char device_id[32]; |