projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[linux-drm-fsl-dcu.git]
/
include
/
asm-m32r
/
ide.h
diff --git
a/include/asm-m32r/ide.h
b/include/asm-m32r/ide.h
index f7aa96970d180c7389a272ea0b8b583ca1ca8325..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,7
+13,7
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <
linux/config
.h>
+#include <
asm/m32r
.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
@@
-25,15
+23,13
@@
# endif
#endif
# endif
#endif
-#include <asm/m32r.h>
-
-
#define IDE_ARCH_OBSOLETE_DEFAULTS
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
#define IDE_ARCH_OBSOLETE_DEFAULTS
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {
-#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2)
+#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) \
+ || defined(CONFIG_PLAT_OPSPUT)
case 0x1f0: return PLD_IRQ_CFIREQ;
default:
return 0;
case 0x1f0: return PLD_IRQ_CFIREQ;
default:
return 0;