diff options
author | amcewen <amcewen@bcs.org.uk> | 2011-08-28 20:28:53 +0100 |
---|---|---|
committer | amcewen <amcewen@bcs.org.uk> | 2011-08-28 20:28:53 +0100 |
commit | 8ce77304f796e077f594859f270f9f024dc05605 (patch) | |
tree | 285233e5b57f0029551056b1951e4e539b265951 /bootloaders/optiboot/optiboot.c | |
parent | e852be3e97763e621a0f8014a3db4bf92a650b50 (diff) | |
parent | f9d50a793010db3a2968262f35d34edaf048a650 (diff) |
Merge branch 'master' into wifly_integration
Diffstat (limited to 'bootloaders/optiboot/optiboot.c')
-rw-r--r-- | bootloaders/optiboot/optiboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootloaders/optiboot/optiboot.c b/bootloaders/optiboot/optiboot.c index af92995..c7d817a 100644 --- a/bootloaders/optiboot/optiboot.c +++ b/bootloaders/optiboot/optiboot.c @@ -213,7 +213,7 @@ int main(void) { // If not, uncomment the following instructions: // cli(); // SP=RAMEND; // This is done by hardware reset - // asm volatile ("clr __zero_reg__"); + asm volatile ("clr __zero_reg__"); uint8_t ch; |