projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-m32r
/
ide.h
diff --git
a/include/asm-m32r/ide.h
b/include/asm-m32r/ide.h
index c82ebe8f250d6fadc84b913a1a48fc9af13bceab..4672a49e8760546f3b835d627359b9c0d62fd418 100644
(file)
--- a/
include/asm-m32r/ide.h
+++ b/
include/asm-m32r/ide.h
@@
-1,8
+1,6
@@
#ifndef _ASM_M32R_IDE_H
#define _ASM_M32R_IDE_H
#ifndef _ASM_M32R_IDE_H
#define _ASM_M32R_IDE_H
-/* $Id$ */
-
/*
* linux/include/asm-m32r/ide.h
*
/*
* linux/include/asm-m32r/ide.h
*
@@
-15,6
+13,7
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <asm/m32r.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
@@
-24,9
+23,6
@@
# endif
#endif
# endif
#endif
-#include <asm/m32r.h>
-
-
#define IDE_ARCH_OBSOLETE_DEFAULTS
static __inline__ int ide_default_irq(unsigned long base)
#define IDE_ARCH_OBSOLETE_DEFAULTS
static __inline__ int ide_default_irq(unsigned long base)