Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / chips / msp430 / usart / Msp430I2CP.nc

diff --git a/tos/chips/msp430/usart/Msp430I2CP.nc b/tos/chips/msp430/usart/Msp430I2CP.nc
index ff1635085cb019b880a0aff4b6088f802875921d..a3c59539bf81966a275d36620da1011387c74822 100644 (file)
--- a/tos/chips/msp430/usart/Msp430I2CP.nc
+++ b/tos/chips/msp430/usart/Msp430I2CP.nc
@@ -99,7 +99,7 @@ implementation {
   default async command error_t UsartResource.immediateRequest[ uint8_t id ]() { return FAIL; }
   default async command error_t UsartResource.release[ uint8_t id ]() {return FAIL;}
   default event void Resource.granted[ uint8_t id ]() {}
-  default async command msp430_i2c_config_t* Msp430I2CConfigure.getConfig[uint8_t id]() {
+  default async command msp430_i2c_union_config_t* Msp430I2CConfigure.getConfig[uint8_t id]() {
     return &msp430_i2c_default_config;
   }