[SQUASH ME] cc2420: fix merge error