Skip to content

L
linux
Commit e66368b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://kernel.bkbits.net/davem/sparc-2.5 

into home.osdl.org:/home/torvalds/v2.5/linux
parents b0200965 55b06271
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
include/asm-sparc/namei.h
View file @ e66368b9
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifndef __SPARC_NAMEI_H #ifndef __SPARC_NAMEI_H
#define __SPARC_NAMEI_H #define __SPARC_NAMEI_H
#define SPARC_BSD_EMUL "usr/gnemul/sunos/" #define SPARC_BSD_EMUL "/usr/gnemul/sunos/"
#define SPARC_SOL_EMUL "usr/gnemul/solaris/" #define SPARC_SOL_EMUL "/usr/gnemul/solaris/"
static inline char * __emul_prefix(void) static inline char * __emul_prefix(void)
{ {
......
include/asm-sparc64/namei.h
View file @ e66368b9
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#ifndef __SPARC64_NAMEI_H #ifndef __SPARC64_NAMEI_H
#define __SPARC64_NAMEI_H #define __SPARC64_NAMEI_H
#define SPARC_BSD_EMUL "usr/gnemul/sunos/" #define SPARC_BSD_EMUL "/usr/gnemul/sunos/"
#define SPARC_SOL_EMUL "usr/gnemul/solaris/" #define SPARC_SOL_EMUL "/usr/gnemul/solaris/"
static inline char * __emul_prefix(void) static inline char * __emul_prefix(void)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7