Changeset c47e1a8 in mainline for kernel/generic/include/func.h

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes (rev. 451)

File:

• kernel/generic/include/func.h (modified) (3 diffs)

kernel/generic/include/func.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -36 +36 @@
 #define KERN_FUNC_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <atomic.h>
 
@@ -42 +42 @@
 
 extern void halt(void) __attribute__((noreturn));
-extern unative_t atoi(const char *text);
-extern void order(const uint64_t val, uint64_t *rv, char *suffix);
 
 #endif