Commit 06580f81 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/acme/BK/includes-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 15681b89 72008dd3
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
*/ */
#include <linux/version.h> #include <linux/version.h>
#include <linux/interrupt.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/ioport.h> #include <linux/ioport.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