diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 00368df0e6c5fe0ef1e80db9fb40c9787fdc883a..3c122166b46b532a70d3e5163f8a7c7861060eaf 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -3041,8 +3041,8 @@ build
     handle and enables the API mm_addregion(start, end);
   </li>
   <li>
-    <code>CONFIG_TICKS_PER_MSEC</code>: The default system timer is 100Hz
-    or <code>TICKS_PER_MSEC</code>=10.  This setting may be defined to inform NuttX
+    <code>CONFIG_MSEC_PER_TICK</code>: The default system timer is 100Hz
+    or <code>MSEC_PER_TICK</code>=10.  This setting may be defined to inform NuttX
     that the processor hardware is providing system timer interrupts at some interrupt
     interval other than 10 msec.
   </li>
diff --git a/arch/avr/src/at32uc3/at32uc3_timerisr.c b/arch/avr/src/at32uc3/at32uc3_timerisr.c
index aa341c3afed5bdc528f14e53a67b016e5b178436..3d171390962efcde9b6ee116f44532db637bb424 100644
--- a/arch/avr/src/at32uc3/at32uc3_timerisr.c
+++ b/arch/avr/src/at32uc3/at32uc3_timerisr.c
@@ -61,8 +61,8 @@
  * setting that defaults to 100 (100 ticks per second = 10 MS interval).
  *
  * However, the AVR RTC does not support that default value well and so, we
- * will insist that default is over-ridden by CONFIG_TICKS_PER_MSEC in the
- * configuration file.  Further, we will insist that CONFIG_TICKS_PER_MSEC
+ * will insist that default is over-ridden by CONFIG_MSEC_PER_TICK in the
+ * configuration file.  Further, we will insist that CONFIG_MSEC_PER_TICK
  * have the value 8 (see reasoning below).
  */
 
diff --git a/configs/README.txt b/configs/README.txt
index aadd2140dd8b67c43f39513aaabe7dda9a159b2c..d937cc41bf9f4d195de60c6b2c12c55d87a15d6e 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -261,8 +261,8 @@ defconfig -- This is a configuration file similar to the Linux
 		  regions of memory to allocate from, this specifies the
 		  number of memory regions that the memory manager must
 		  handle and enables the API mm_addregion(start, end);
-		CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-		  or TICKS_PER_MSEC=10.  This setting may be defined to
+		CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+		  or MSEC_PER_TICK=10.  This setting may be defined to
 		  inform NuttX that the processor hardware is providing
 		  system timer interrupts at some interrupt interval other
 		  than 10 msec.
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 20793d48b6a3f5cd8f7242eb8d188be79fda48a8..df7e285e30f00559795e300d875d1a3027573625 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -228,8 +228,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 7039557bc224409746b5900c00e92a59a420cf29..77a668add41abf50d8c15dd46f9220fd4738dce5 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -228,8 +228,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 6f27c57088a2bfffe6192af279069c5ddb4b2163..66a070a0d3312abe594a98e3f4004eddac3c5541 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -147,8 +147,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 07b217fcaff0099a5bda0841a04a2f0508b5a072..6daa4309b7e28d384626e77b71fbc1755204f73b 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -147,8 +147,8 @@ CONFIG_NET_C5471_BASET10=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 81b09c5700a4829150f37861d35a1bec58575dbb..8ad5bdce91b993a274393a6b18edf8ac193178a3 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -147,8 +147,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/c5471evm/ostest/defconfig b/configs/c5471evm/ostest/defconfig
index d265a2b33dd7f0906e444d0d39ba920da46440d7..fa0f15446e034ab23e0a6a635facf6cefc6c37e3 100644
--- a/configs/c5471evm/ostest/defconfig
+++ b/configs/c5471evm/ostest/defconfig
@@ -147,8 +147,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index e3542a07c2817dcae9103ef4e17e084f6c5bdaf7..3848c1a61fff7d57441d0c33e7ce9099a48d306e 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -207,8 +207,8 @@ CONFIG_PASS1_OBJECT=
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/detron/hidkbd/defconfig b/configs/detron/hidkbd/defconfig
index b359b2953e5a743a7d925aca8347839a203fa2d0..00b6503f95fc33104877f969c0cb5ff4d4721b5e 100755
--- a/configs/detron/hidkbd/defconfig
+++ b/configs/detron/hidkbd/defconfig
@@ -246,8 +246,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/detron/nsh/defconfig b/configs/detron/nsh/defconfig
index ac8a5259ddc852b0a87a8d30799a9a4ddfe7c53a..dc09521989d793d7e1262547472f473fb590c384 100755
--- a/configs/detron/nsh/defconfig
+++ b/configs/detron/nsh/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/detron/ostest/defconfig b/configs/detron/ostest/defconfig
index 115ee6b742f14c876de7129abe6b60846a831358..4b8ef06cfdd55b320ee1593390621455593423a8 100755
--- a/configs/detron/ostest/defconfig
+++ b/configs/detron/ostest/defconfig
@@ -242,8 +242,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/detron/wlan/defconfig b/configs/detron/wlan/defconfig
index bb55832aad60ba3cd294e6e9a4e77b8462f492f7..3eb7d82d54291d4bd479d1b3c6f7dfab0c30bf96 100755
--- a/configs/detron/wlan/defconfig
+++ b/configs/detron/wlan/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 9c6faa8aceef8095c24ca9c634338d4cfaa9335f..29da6335deea112cedbb1ef3d6ecb953e908441c 100755
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -213,8 +213,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 9df0b90c128dcd7ff703ade9223ff0ca95a612c0..f085980bace16a63a849ed6c59260a52c83bb2ad 100755
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -213,8 +213,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 471792d5913bae791ba55cec92911e8b0bf0a702..e24897d24053f4f0b52a87a6b9365cbed762b505 100755
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -221,8 +221,8 @@ CONFIG_PASS1_OBJECT=locked.r
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index fcf8d0d038637cbda666cc05ec6fc06a4e3fe684..29c169cfdc21c0ead6312f7fd69c6c936599ac15 100755
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -213,8 +213,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 7e6b26736055b7f1f3afc195b7ee118743ebdb5e..df2cb7464266d30c342500318117e5b216696930 100755
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -213,8 +213,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 78eda467dfa1d773b037ae4a971905ff8ffdadbf..200b9006c7e55ddd2775595e6de85af85013bf86 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 31c4e394646fc2734b2df2d2a3b401a62d70236d..1f3e0ec5ce1c4ba0d39886b20473b2588cac1627 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index d3a4642b05e4d24337c6fef565876d743ee6e715..400777d774e1322e9bf390743e0c09ec0171879b 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index d6782d333c05f9e156fb8dde4ff3a7fc23fd2419..712658716fb514ed76c545eb8186ca5d3f7badde 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 2f531a06e5a67f934ace50529bfaeb7913c352e9..5cf69cf43c67c10b3ec33cbc343a13a78cbf36ce 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 08a6f4835acafebac3253ca7ebccddce194f49b0..980211f1a6540819c735ba5f5d26dc040d86170d 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 93960cd508d27d4b8847f7056b735b18e325a838..886533daa4167e30541162422d7b0141e354ab4a 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -181,8 +181,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index d2540d204d39779d67c62b123a1c086310bc70d1..ca499c9a48ed0361abdfce6ca6802fd2c0fb0457 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -186,8 +186,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 1cbea1a6ddd044da82a04e4fb451d3fb3f732807..09acb43f3ca01219dc6383ee41900578dd3b7bd1 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -186,8 +186,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 5cf42e7e062c7a39f0ccac8569fa79cee6cd0366..6923717d48e960f475dd086afd5c6cb9d74d94ae 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -186,8 +186,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 78741dad296a78fce61c5154b10d477755d94595..43c0a3de180cdef349108171f25d92c64861d8d2 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -186,8 +186,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 4ab55d5f3627d8744bba9c5793f492ad6bf25153..054e9fe0aa058141ae3f81eb919382390d18066a 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -184,8 +184,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 6d08c03915ca8a99c69d28a419e5297b5b914d1f..c2a74015277a8358d75457d80d08e68ae2b950e9 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -186,8 +186,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 27d09a8681dbb3f2f968b7037a01bf6adb94287c..1572b14563310c1e2e2463f5e891734d6ee3e157 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -229,8 +229,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 8c89c0594ca187eee5c01ce837cdddd2d821fb86..759c14d3a79b4df326ede421ffbd07f2e632bc5a 100755
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -234,8 +234,8 @@ CONFIG_SPI_CMDDATA=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index 7c678b3a4a92bdbe38d99319b31c1da560d569f0..a9708b6608beb79c2a700db11591cce1232ab470 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -229,8 +229,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index ef71ef66299a4da0348b326b34b2f2f7254cf8c4..4b4bbed6c273ce27b9e91cb903309aa7da275c85 100755
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -229,8 +229,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 24d9e0ebc3784d16d9afbf3ca9e5e34655e7973e..e76f69a9e53b1f5113dfad58d34ec0ebe132ce7d 100755
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -234,8 +234,8 @@ CONFIG_SPI_CMDDATA=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index a858ea3ebae6fad28dbcfb162c5fd18018d369ac..a2e7a03797a4b0383a62952469d413151f88fa89 100755
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@@ -229,8 +229,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index a638ba538aa24ebd115f37c98ce41ca3c59c09cc..e60c02c1b8af2b59577e073a239c11febbaa4e89 100755
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 6a2dfb006e7ac6f4416d55eba3a65c1d18c2d355..9884ec957d8ad142f779fae6ab633f5dc50810e5 100755
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -255,8 +255,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 69b497b9a091c8378cfb05c14bff69d272f641a2..477ca4ef772393126e0be34577c1dd2c7d34b8e5 100755
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -254,8 +254,8 @@ CONFIG_SPI_CMDDATA=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/ostest/defconfig b/configs/lpcxpresso-lpc1768/ostest/defconfig
index 718766c45f83d0d1946516a0f8891146ccfa004a..0975342d91f0fd14c52c5685906edbc253a34a01 100755
--- a/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index 8816c7fdcec98284531a856a2d2247e5065c77cf..2c4a25224ab35b43180321f42b5721a6b91ad4bc 100755
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -252,8 +252,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 04ce1472cc5d2e22a1cc8cc0a934535c4b77043f..9df689f5ca9b5dfce9349115a9705f3d4e582291 100755
--- a/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 7af074c760a3bafac10cd3cfe9fdb1f20a2550e8..2259d41b83bece17c6b47da9235fd058fc5ddf4b 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -117,8 +117,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 25260cee97296bd688f9610241b7be01632698e9..ead1cbf3e40bf7cb3d9c8a611cd8290668b08cd3 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 308e58bda2c47916c4dd9b86180af24d84b921c1..df99bb4ce415917a4fe762fbd8dfa351f7f31728 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -242,8 +242,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index c5dad882579f3cc6b477fd3db38fb36ee09d41fc..872f8df0aa1886058286327433de6ee138bc1c21 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -151,8 +151,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 5446b0ca8d685a3b3c4778fc4fc86c72b30f2b96..06609469e90de0fae66fb732e11dfd0c442eb625 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -151,8 +151,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 0f8d4925a3b3b24cef84e752567870c28e061398..3a6edf7868d8500b805ee6f50685eddf6a1cf273 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -151,8 +151,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index 142d7ba195709af47d3f0edc3553db00a7983d3c..bf0eaba32c4151469d8b6f50f45b086c00a3b11d 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -151,8 +151,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index ea908547fd35563f89a42259e9015e51131a885a..6c19b4a83a5f941e89a0ae84bb1708e65a66b182 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -167,8 +167,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index c46d58d432cc96201fb04de5f1feefe20ce159a4..d7eae861bd3cd0bb10b5d903420e132160f46489 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -218,8 +218,8 @@ CONFIG_PASS1_OBJECT=
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 87fd5d140ef8fcba60381a2446c9bfa4860364bd..d66cb8dd02559757f394414c4f22ce19609f2d48 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 78f2aeddb94f454757c69c728cb21f592b166b53..f1f58151305260667f05382615c053c500f07854 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -154,8 +154,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 246bbae293f085da5da312189cdec46dc5373c32..a50d13d0988a0a589e7a240982f4dad6db1e2b86 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 51c9981bf0edf1ec393527532fe9c24ac9e6b51f..6f82c44ea0571fbeeac2d4dddb88343eebee4504 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 886af9e890c4bdb0c021036db97c1c090447a3f2..9c614beaa4811dbeefcc3340abd4b51dd1241e62 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -159,8 +159,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 67c204bb2609ea08dff73080336d1c264863604a..643531c75cbbe0346625daf2811c902356327360 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 2b0d101e61b6ae66cbd3f08509b47c6b06f3bcd9..9a747ebde62ab022f88fffa82738641942b43895 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -155,8 +155,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 4dc066b8a865ac5afef3ef96c7c063b7a4f4532c..a5308fd3a6303a89fadf21870e6a2d31dcbdc906 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -245,8 +245,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index 82549346cdee48edd6017f6aea204c017586c585..16003686e671047d53acc893a74250eb3822a98b 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -242,8 +242,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 7d9ed920fad2784c7fb08cce098226d6bdf77e5e..4a4d1926f9820d250d8b7bdff95e4bab134d4b0a 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -242,8 +242,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index 3727038065ad5007f8344cb7b42e69800b6772a9..2ef1c287d78549100d039c1617dc719999e47ca9 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -242,8 +242,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 5da615c1b174ce765c58471d4da01b7f1d323cbf..5f1eb61be96e3485e6f9f303d17bfba750ed360e 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 87a8de98858c43ec0cff617ac70565c7ffc86451..8f2f02937d0b1026d1f64f134bc068054e47e62a 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 5c8bcf067303b38291c7e9fb05570d4d3991d69a..c177f11ef53ca680485dfcceb775915e8137b95e 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -249,8 +249,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 2731d8b2223cb84ffee7749edc8931285bc0bd27..1ffd9defe8829b4d7bb8e74a4df56a377623ebec 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -248,8 +248,8 @@ CONFIG_SPI_CMDDATA=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index fca6bf11bf91574db70352f7faaafb4019e32153..4f6fc29f088a34469a8984511eb501e0f74f0329 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -243,8 +243,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 068d44f8a15bfd993e0361354ccdbbfaa99e5843..641572163a15aee6bb4c64d8e4a5105bea3ad312 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -248,8 +248,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index bcc8a458bbe0292fedb0178dde8aa85118380826..61e66a81792e6d46ea1c652cb8fa717c7f832410 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -246,8 +246,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index f5237146f2a0a3475a23a3b52c39225fc5a0129b..cb55b85a32238ec740da9449ffb8e0940bc5cd2a 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -243,8 +243,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index 10e7e2bcb4980fb6d8e2fe9ff253ae3132f7a103..975bddc8aac027656f719cdd516546414fca55c4 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -243,8 +243,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig
index 53a5f02af4110c0ee0da4ef18a436139c47e4a97..3f60ec1ad4b049f942b2829955a24bf8d2b935bc 100755
--- a/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/configs/olimex-lpc1766stk/wlan/defconfig
@@ -248,8 +248,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 7aaeb27ae292f2b9f4a417ce51dcb7e2f97c0274..561096828fb321942629fb704ddb2cc198bb66a9 100755
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -172,8 +172,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-lpc2378/ostest/defconfig b/configs/olimex-lpc2378/ostest/defconfig
index 3e1093723509a16d9eba9b986f607d6bf5a3e08f..f462c21d67d2d1c338619b367a9f686386c787a7 100755
--- a/configs/olimex-lpc2378/ostest/defconfig
+++ b/configs/olimex-lpc2378/ostest/defconfig
@@ -172,8 +172,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 159c5916a9f2e2358cccf2d0971808fa64f50919..684f20b00381dda8fdb43be3be0726e3e753b00b 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index cf324c4dc9bf4e2301e307f9789aac687dc48055..6ef24e489c2635e671e4ce0f2337b2324e0d5dab 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index d914aaa74eb1a0060db6e5208eadbc50eb8058fb..d309942709c5dc538edce57b60c79c311b1810f3 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -218,8 +218,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/pcblogic-pic32mx/ostest/defconfig b/configs/pcblogic-pic32mx/ostest/defconfig
index 2b2ca4674de39143cf2ec7782178e2359bdba7e0..7966c1b4932904ab28c5a852eec7b98d5ab1c83b 100644
--- a/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/configs/pcblogic-pic32mx/ostest/defconfig
@@ -217,8 +217,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 811d346b569247ff79fc71b3cfe62610da10eb2f..32341becbb4aaaf7a51bf47881fc74b2f8893f95 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -115,8 +115,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 9660d737af4bee8db9e486e91a1e5e7bb0ab8eb7..890d82deaaf5250fdb80cee2d2ca1be18e6d6dd9 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -185,7 +185,7 @@ CONFIG_UART3_2STOP=0
 #   memory manager must handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot time console
 #   output.
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz or TICKS_PER_MSEC=10.
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz or MSEC_PER_TICK=10.
 #   This setting may be defined to inform NuttX that the processor hardware is
 #   providing system timer interrupts at some interrupt interval other than 10
 #   msec.
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 1de26365182be09b612e24e3d353de8a04c3d80c..816974678062ffb9a100e512ab31a956b4022713 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -101,7 +101,7 @@ CONFIG_ARCH_DMA=n
 #   memory manager must handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot time console
 #   output.
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz or TICKS_PER_MSEC=10.
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz or MSEC_PER_TICK=10.
 #   This setting may be defined to inform NuttX that the processor hardware is
 #   providing system timer interrupts at some interrupt interval other than 10
 #   msec.
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 677cb548a48b71a73347cc50101568a97de86aeb..51f83efc34e3718f3f77e55873801277119cac80 100755
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -233,8 +233,8 @@ CONFIG_PASS1_OBJECT=
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index d1b271e282922b685503385dea356c8243c0998a..9294603f49c893c7cccf74940428c84fe31a7faa 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index f06c2c2341f4e0b74a139148d3508345bbadf658..ea1b6093673541931e830185eacbac57f46dc4a7 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -215,8 +215,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index a90e7cc7acae2bade46fe5cb41a9f32602cdae38..cf4f15024075e371aa9da4567c22ede322dae1fd 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -216,8 +216,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 9738f8cbd107e2d2cb0f921f2246e566ecbe4f53..ee37111d4b392baa03553927e0faba69dc4fe5c9 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 88e899f61065fe6a251acab9ab0533899ae72206..bb00f3f591ade208698c2b23799236b2e7c6f78b 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 7cd746c6ee63587fdb81e42706a07f4f05882968..18722b15ca9ff4e9f9723be8e28fa2889cc41e11 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 2d5825f51304f277d71f4a292cb27294b1f8dacb..2962d6b0bc6f4375743614307766676460c8190d 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -71,8 +71,8 @@ CONFIG_SIM_FBBPP=8
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11
index ec90d0181bb77ac0403f5e84c2f63d8cf8937eb5..27a6a51fa0be0d17dbab41364daa72740ee806d4 100644
--- a/configs/sim/nx/defconfig-x11
+++ b/configs/sim/nx/defconfig-x11
@@ -71,8 +71,8 @@ CONFIG_SIM_FBBPP=32
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 15560befe09373f016ec818fe7e1eb0c33018ca1..2030608cd1ee180816aa757e3864b6e812bd5ad1 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index f970524f5f90e7286b6b28d144fedc93e85ebc1a..df9bdf8258c832de256ee5522b5fd2a568a7f1ed 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 082bd66a0dfb07af9025d44c7fde5b7e0341ef5f..c00e25b15eec8fa0ac159dc78fdb916d2d7b6fa9 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -64,8 +64,8 @@ CONFIG_ARCH_BOARD_SIM=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 363c9a4323716bbbf8b1e86207ca64722f90fe2c..cef59192bd24ef8957d8e2e76fb9a10a928257f4 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -162,8 +162,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index b802ef9f40d1c7214fe3136abcc5f143063110cb..3a7555068a87b96e15d21de49be3a8175792246d 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -238,8 +238,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 2ec1edc330e2a6eb1fe16b97705dbe5ae582bd55..be344261fd51a7fb13121836e28286b6d5c82109 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -248,8 +248,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 8df5955cb6e3a8cff94be0ac6defd797e91527cd..1d4adf35c3fb97de9ce4435e424f3a4eee59e818 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 78d2f9472f6e582ee24abf7d4ed73a5d2459894c..5e7c7ecd220ab0cf922cc08b53a04f5ddbaeb412 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -250,8 +250,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index 506f0c08e34ab329d8f862b7532458e9651c041f..dd93e81e79a48e0cb989091804cb6f0aacff2554 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -248,8 +248,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index eb023ecb2a7dd772cc5e604f0e972718afe70022..eab7e1ca6aacf46dfd42365128fb8430d840d82f 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -166,8 +166,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 40cd908f9666a6dbc43f5dbfcd5f6733c5173947..81f2053724277b1d2967c0a49bf26c83f7d0a4be 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -166,8 +166,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index dd5b1ca37cadce0e23fc3486c902a67ffa7f3fd1..1b979ad16600a626ca7b30dac29a79b57275be9d 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -311,8 +311,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index ec73f289f6b7e26814c281b723eed16b15fb8637..12a73fe6e1057caa89c38ce12093656882b99e31 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -107,8 +107,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 00c7cf090f86dadef1fd0ea852f9297cd61ff473..974c2a73153bc9b3bce604869e350155b10a9be1 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -107,8 +107,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 942d7f732e6c9d442ff49cc40e73639d318cbfe1..8a30014386162c8c77510e03d968bf5b325b3533 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -107,8 +107,8 @@ CONFIG_LINKER_ROM_AT_0000=y
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index b84cc5040d0bd957666fa67be68d2a66c0496929..89e3d163d1095ceb2e16453373a21eedbb16446e 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index c253f9aaaaf44175c2719b9ffa6480125cf4a1fd..3c89dfc07ae7a0bc35b4680bd20ef4e40707a526 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -139,8 +139,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 58b1538b1d080d2de959d46f905fc7e843fdddd1..da704a791f7cbb05f6fd748a7090b67b0aebdf64 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -97,8 +97,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index 80bad068123708debe7a95d5447d59dc659a63e4..e66e345915bef36b1dab99bcaea1434344391de5 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -97,8 +97,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 4f0a2ef0fad7a5045f8878ea400d1cb19b863306..2a397791944c68f44ec6275561cb61e799013c70 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -97,8 +97,8 @@ CONFIG_HAVE_LIBM=n
 #   handle and enables the API mm_addregion(start, end);
 # CONFIG_ARCH_LOWPUTC - architecture supports low-level, boot
 #   time console output
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 0b87b751bb98cf167a00f2fb1ff2f8b26b7c9694..d1cca6fe48367341fca5d8f47ca0860a69c6bbc2 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -131,8 +131,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index c552987bc1b29dab934763e4ea8a86c91a51021e..326e3e92d03d447d0fdbe7be13197d23a4f078ee 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -131,8 +131,8 @@ CONFIG_HAVE_LIBM=n
 #   time console output
 # CONFIG_HAVE_GETPUTC - architecture supports low-level, boot
 #   time console input
-# CONFIG_TICKS_PER_MSEC - The default system timer is 100Hz
-#   or TICKS_PER_MSEC=10.  This setting may be defined to
+# CONFIG_MSEC_PER_TICK - The default system timer is 100Hz
+#   or MSEC_PER_TICK=10.  This setting may be defined to
 #   inform NuttX that the processor hardware is providing
 #   system timer interrupts at some interrupt interval other
 #   than 10 msec.
diff --git a/include/nuttx/resource.h b/include/nuttx/resource.h
new file mode 100644
index 0000000000000000000000000000000000000000..b8e66446b96fac5339c95d1f5d7c3c80fdeb1e33
--- /dev/null
+++ b/include/nuttx/resource.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+ * include/nuttx/resource.h
+ *
+ *   Copyright(C) 2011 Uros Platise. All rights reserved.
+ *   Author: Uros Platise <uros.platise@isotel.eu>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/** \file
+ *  \author Uros Platise
+ *  \brief System Resources
+ * 
+ * System resource provides interface to device drivers to list possible
+ * configurations that can be changed by system to minimize (optimize)
+ * energy and power usage, to lock a specific resource, fixing it at
+ * desired value and to support multiple power down capabilities by the
+ * up_idle().
+ * 
+ * System resources are provided on the chip or board level, such as:
+ *  - clock scaling (chip level)
+ *  - voltage scaling (board level)
+ * 
+ * This interface is to be used by low-level peripherals only and its
+ * purpose is to be as fast as possible to do quick power and energy
+ * optimizations (including deep power savings).
+ * 
+ * A separate common device driver interface would be required to allow
+ * access from user programs (i.e. to select voltage and similar).
+ **/ 
+
+#ifdef CONFIG_RESOURCE
+
+#ifndef __INCLUDE_NUTTX_RESOURCE_H
+#define __INCLUDE_NUTTX_RESOURCE_H
+
+#include <nuttx/config.h>
+#include <nuttx/arch/chip/resource.h>
+#include <nuttx/arch/board/resource.h>
+
+#include <stdint.h>
+
+/****************************************************************************
+ * TO BE MOVED UNDER arch/chip/resource.h
+ ****************************************************************************/
+
+/** Clocking */
+#define RESOURCE_CLOCK_HCLK
+#define RESOURCE_CLOCK_PCLK1
+#define RESOURCE_CLOCK_PCLK2
+
+
+/****************************************************************************
+ * TO BE MOVED UNDER arch/board/resource.h
+ ****************************************************************************/
+
+/** Voltage, Vcc Minimum Requirements */
+#define RESOURCE_VOLTAGE_VCC_MIN2_3     0x00
+#define RESOURCE_VOLTAGE_VCC_MIN3_0     0x01    /* A/D converter starts working at this level */
+#define RESOURCE_VOLTAGE_VCC_MIN3_3     0x02
+
+
+/****************************************************************************
+ * Available Options to be enabled in the .config
+ ****************************************************************************/
+
+#if 0
+
+/** Enable Resources 
+ */
+#define CONFIG_RESOURCE
+
+/** Enable resource: clock scaling, allocates an array of options bits
+ *  for each peripheral. On STM32 this option adds about 64-128 bytes.
+ *  This option is provided by chip: nuttx/arch/board/resource.h
+ * 
+ * Clock resources are used by low-level driver before they starts a 
+ * transaction. System may pick up any of the clock options that suit 
+ * all of the drivers. The selected clock option is returned, and is up 
+ * to the driver to recalculate and modify i.e. period or additional 
+ * prescaler to achieve the desired frequency of operation. After lock() 
+ * call, clock will not change, until unlock() is called.
+ * 
+ * As long there is a single clock lock, system will not be able to 
+ * enter low power-down mode in which all of the clocks are disabled.
+ * 
+ * The isactive() function is called typically by the up_idle() to 
+ * decide which power-down mode to select. If none of the clocks are
+ * required to run, then ultra low power-down mode can be entered,
+ * reducing power as low as downto 35 uA or 25 uA (with LDO in low-power
+ * mode).
+ * 
+ * Note: AD may continue to consume power in stop mode, so it's up 
+ *   to AD driver to disable its power when its unused.
+ */
+#define CONFIG_RESOURCE_CLOCK_SCALING
+
+/** Enable resource: voltage scaling.
+ * 
+ *  This option is provided by the board: nuttx/arch/board/resource.h
+ */
+#define CONFIG_RESOURCE_VOLTAGE_SCALING
+
+/** Resource Check: check for multiple locks/unlocks conditions and 
+ *  report errors.
+ * 
+ *  For proper operation after lock(resourceN) only one unlock(resourceN)
+ *  may follow. Enabling this option adds time consuming checks to detect
+ *  errors in low-level drivers.
+ */
+#define CONFIG_RESOURCE_CHECK_MULTIPLES
+
+#endif
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Interface
+ ****************************************************************************/
+ 
+/** Resource Interface */
+
+struct resource_ops_s {
+
+    /** Set possible options for specific domain and peripheral ID */
+    uint32_t (*setopts)(struct resource_dev_t *dev, uint8_t domain_id);
+    
+    /** Get available options */
+    uint32_t (*getopts)(struct resource_dev_t *dev, uint8_t domain);
+
+    /** Lock resource, means, that it cannot be changed meanwhile */
+    uint32_t (*lock)(struct resource_dev_t *dev, uint8_t domain_id);
+    
+    /** Unlock resource, means, allow further changes */
+    uint32_t (*unlock)(struct resource_dev_t *dev, uint8_t domain_id);
+    
+    /** Reports present activity 
+     * \retval >0 activity
+     * \retval =0 Inactivity allowing system entering deep power down modes.
+     * \retval <0 internal error, system cannot resolve requests.
+     */
+    int  (*isactive)(struct resource_dev_t *dev);
+};
+
+#define RESOURCE_SETOPTS(dev, domain_id)    dev->setopts(dev, domain_id)
+#define RESOURCE_GETOPTS(dev, domain)       dev->getopts(dev, domain)
+#define RESOURCE_LOCK(dev, domain_id)       dev->lock(dev, domain_id)
+#define RESOURCE_UNLOCK(dev, domain_id)     dev->unlock(dev, domain_id)
+#define RESOURCE_ISACTIVE(dev)              dev->isactive(dev)
+
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+#endif /* __INCLUDE_NUTTX_EVENT_H */
+#endif /* CONFIG_RESOURCE */