git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[sfrench/cifs-2.6.git]
/
include
/
asm-sh
/
pci.h
diff --git
a/include/asm-sh/pci.h
b/include/asm-sh/pci.h
index 6ccc948fe216e003aee84018b519c09a8708e848..b1f9a9e0231e000df1ccf1a40a1a9d3b60427453 100644
(file)
--- a/
include/asm-sh/pci.h
+++ b/
include/asm-sh/pci.h
@@
-35,7
+35,7
@@
extern struct pci_channel board_pci_channels[];
/*
* I/O routine helpers
*/
-#if
def CONFIG_CPU_SUBTYPE_SH7780
+#if
defined(CONFIG_CPU_SUBTYPE_SH7780) || defined(CONFIG_CPU_SUBTYPE_SH7785)
#define PCI_IO_AREA 0xFE400000
#define PCI_IO_SIZE 0x00400000
#else