From 55173b29da939690453db807764de31bb9e667a8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 8 Jan 2011 14:58:27 +0000
Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2618
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvproj | 4 ++--
 os/ports/RVCT/ARMCMx/chcore.c                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvproj b/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvproj
index e69135a04..f1c299a59 100644
--- a/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvproj
+++ b/demos/ARMCM0-LPC1114-LPCXPRESSO/keil/ch.uvproj
@@ -12,13 +12,13 @@
       <ToolsetName>ARM-ADS</ToolsetName>
       <TargetOption>
         <TargetCommonOption>
-          <Device>LPC1114x302</Device>
+          <Device>LPC1114x301</Device>
           <Vendor>NXP (founded by Philips)</Vendor>
           <Cpu>IRAM(0x10000000-0x10001FFF) IROM(0-0x7FFF) CLOCK(12000000) CPUTYPE("Cortex-M0")</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
           <StartupFile>"STARTUP\NXP\LPC11xx\startup_LPC11xx.s" ("NXP LPC11xx Startup Code")</StartupFile>
           <FlashDriverDll>UL2CM3(-UV1742AOE -O463 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD10000000 -FC800 -FN1 -FF0LPC1xxx_32 -FS00 -FL08000)</FlashDriverDll>
-          <DeviceId>5376</DeviceId>
+          <DeviceId>5063</DeviceId>
           <RegisterFile>LPC11xx.h</RegisterFile>
           <MemoryEnv></MemoryEnv>
           <Cmp></Cmp>
diff --git a/os/ports/RVCT/ARMCMx/chcore.c b/os/ports/RVCT/ARMCMx/chcore.c
index 56ddcb6bc..627b4c812 100644
--- a/os/ports/RVCT/ARMCMx/chcore.c
+++ b/os/ports/RVCT/ARMCMx/chcore.c
@@ -33,7 +33,7 @@
  *          to redefine it in your application code.
  */
 #if !defined(__DOXYGEN__)
-__weak
+__attribute__((weak))
 #endif
 void port_halt(void) {