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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-sparc
/
ide.h
diff --git
a/include/asm-sparc/ide.h
b/include/asm-sparc/ide.h
index
1f43972
..
a6d735a
100644
(file)
--- a/
include/asm-sparc/ide.h
+++ b/
include/asm-sparc/ide.h
@@
-11,7
+11,6
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/psr.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/psr.h>
@@
-19,17
+18,8
@@
#undef MAX_HWIFS
#define MAX_HWIFS 2
#undef MAX_HWIFS
#define MAX_HWIFS 2
-static __inline__ int ide_default_irq(unsigned long base)
-{
- return 0;
-}
-
-static __inline__ unsigned long ide_default_io_base(int index)
-{
- return 0;
-}
-
-#define ide_init_default_irq(base) (0)
+#define IDE_ARCH_OBSOLETE_INIT
+#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define __ide_insl(data_reg, buffer, wcount) \
__ide_insw(data_reg, buffer, (wcount)<<1)
#define __ide_insl(data_reg, buffer, wcount) \
__ide_insw(data_reg, buffer, (wcount)<<1)