git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m68k
/
ide.h
diff --git
a/include/asm-m68k/ide.h
b/include/asm-m68k/ide.h
index
36118fd
..
f9ffb2c
100644
(file)
--- a/
include/asm-m68k/ide.h
+++ b/
include/asm-m68k/ide.h
@@
-31,7
+31,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <asm/setup.h>
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/io.h>
@@
-124,7
+123,7
@@
static __inline__ void ide_release_lock (void)
}
static __inline__ void
}
static __inline__ void
-ide_get_lock(irq
return_t (*handler)(int, void *, struct pt_regs *)
, void *data)
+ide_get_lock(irq
_handler_t handler
, void *data)
{
if (MACH_IS_ATARI) {
if (falconide_intr_lock == 0) {
{
if (MACH_IS_ATARI) {
if (falconide_intr_lock == 0) {