Changeset 86ffa27f in mainline for kernel/arch/mips64/include/faddr.h

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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.

File:

• kernel/arch/mips64/include/faddr.h (moved) (moved from uspace/srv/hid/fb/sgcn.h ) (2 diffs)

kernel/arch/mips64/include/faddr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Pavel Rimsky
+ * Copyright (c) 2005 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @defgroup sgcnfb SGCN
- * @brief       userland driver of the Serengeti console output
+/** @addtogroup mips64
  * @{
  */
- 
 /** @file
  */
 
-#ifndef FB_SGCN_H_
-#define FB_SGCN_H_
+#ifndef KERN_mips64_FADDR_H_
+#define KERN_mips64_FADDR_H_
 
-int sgcn_init(void);
+#include <typedefs.h>
+
+#define FADDR(fptr)  ((uintptr_t) (fptr))
 
 #endif
 
-/** 
- * @}
+/** @}
  */