Skip to content

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

Merge http://gkernel.bkbits.net/alpha-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents e18fad25 6dc89ff4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
arch/alpha/kernel/srm_env.c
View file @ 94dc90de
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <asm/console.h> #include <asm/console.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/machvec.h>
#define DIRNAME "srm_environment" /* Subdir in /proc/ */ #define DIRNAME "srm_environment" /* Subdir in /proc/ */
#define VERSION "0.0.2" /* Module version */ #define VERSION "0.0.2" /* Module version */
......
include/linux/dcache.h
View file @ 94dc90de
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <asm/atomic.h> #include <asm/atomic.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <asm/page.h> /* for BUG() */
/* /*
* linux/include/linux/dcache.h * linux/include/linux/dcache.h
......
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