Merge over into the trunk.

[tinyos-2.x.git] / tos / chips / atm128 / spi / Atm128SpiC.nc

diff --git a/tos/chips/atm128/spi/Atm128SpiC.nc b/tos/chips/atm128/spi/Atm128SpiC.nc
index ecb18d6a52d51018bb1c50d34b0fea35aff95d2e..637232fd33219e9366e3801d7814ec9bf918afc0 100644 (file)
--- a/tos/chips/atm128/spi/Atm128SpiC.nc
+++ b/tos/chips/atm128/spi/Atm128SpiC.nc
@@ -71,11 +71,10 @@ configuration Atm128SpiC {
 implementation {
   components Atm128SpiP as SpiMaster, HplAtm128SpiC as HplSpi;
   components HplAtm128GeneralIOC as IO;
-  components new FcfsArbiterC("Atm128SpiC.Resource") as Arbiter;
+  components new SimpleFcfsArbiterC("Atm128SpiC.Resource") as Arbiter;
   components McuSleepC;
   
   Init         = SpiMaster;
-  Init         = Arbiter;
   
   SpiByte      = SpiMaster;
   SpiPacket    = SpiMaster;