From: R. Steve McKown <rsmckown@gmail.com>
Date: Wed, 26 May 2010 19:31:47 +0000 (-0600)
Subject: Merge branch 'master' into debian/2.1.1
X-Git-Tag: debian/2.1.1-4.3-1tmi~1
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=c562460e49244c27e0821ff67935c8d032862c21;hp=78255a288f134da6758a8472bd0cb315c4b33182;p=tinyos-2.x.git

Merge branch 'master' into debian/2.1.1
---

diff --git a/tools/platforms/msp430/pybsl/tos-bsl.in b/tools/platforms/msp430/pybsl/tos-bsl.in
index 0abf3d03..4cd94d86 100644
--- a/tools/platforms/msp430/pybsl/tos-bsl.in
+++ b/tools/platforms/msp430/pybsl/tos-bsl.in
@@ -1423,8 +1423,8 @@ class bsl_cp2103(bsl_standard):
 	bsl_standard.bslInit(self)
 
 
-GPIOBIC  = 0x8002
-GPIOBIS  = 0x8003
+GPIOBIC  = 0x89f2
+GPIOBIS  = 0x89f3
 GPIO_2 = 0x04
 GPIO_3 = 0x08