diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
index 9c6bbf7a94..b0c54cad1d 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
+++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* shmsupp/lock.c:
+	Use "__asm__" instead of "asm" for improved c99-compliance.
+
 2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* timer/timer.c: Include <rtems/btimer.h>.
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c
index c0d29adf00..c002acc389 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c
+++ b/c/src/lib/libbsp/nios2/nios2_iss/shmsupp/lock.c
@@ -53,7 +53,7 @@ void Shm_Lock(
 
     Shm_isrstat = isr_level;
     while ( lock_value ) {
-      asm volatile( ""
+      __asm__ volatile( ""
                          : "=r" (lockptr), "=r" (lock_value)
                          : "0" (lockptr),  "1" (lock_value)
                   );
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
index c5a7573a77..b1fa9c7dd2 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-11	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* shmsupp/lock.c:
+	Use "__asm__" instead of "asm" for improved c99-compliance.
+
 2011-02-09	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* timer/timer.c: Include <rtems/btimer.h>.
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
index c0d29adf00..c002acc389 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/shmsupp/lock.c
@@ -53,7 +53,7 @@ void Shm_Lock(
 
     Shm_isrstat = isr_level;
     while ( lock_value ) {
-      asm volatile( ""
+      __asm__ volatile( ""
                          : "=r" (lockptr), "=r" (lock_value)
                          : "0" (lockptr),  "1" (lock_value)
                   );