diff options
| author | Adrian Bunk <bunk@stusta.de> | 2005-11-07 12:26:59 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@r063144.stusta.swh.mhn.de> | 2005-11-07 12:26:59 +0100 |
| commit | b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (patch) | |
| tree | 66bf5c66ed505a739bf8633d1931f0d0526bd6d6 /include/asm-arm/arch-iop3xx/iop331.h | |
| parent | Update Michal Wronski contact info (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.tar.xz linux-b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2.zip | |
Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-arm/arch-iop3xx/iop331.h')
| -rw-r--r-- | include/asm-arm/arch-iop3xx/iop331.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop3xx/iop331.h b/include/asm-arm/arch-iop3xx/iop331.h index 96adffd8bad2..fbf0cc11bdd9 100644 --- a/include/asm-arm/arch-iop3xx/iop331.h +++ b/include/asm-arm/arch-iop3xx/iop331.h @@ -42,7 +42,7 @@ /* this can be 128M if OMWTVR1 is set */ #define IOP331_PCI_MEM_WINDOW_SIZE 0x04000000 /* 64M outbound window */ -//#define IOP331_PCI_MEM_WINDOW_SIZE (~*IOP331_IALR1 + 1) +/* #define IOP331_PCI_MEM_WINDOW_SIZE (~*IOP331_IALR1 + 1) */ #define IOP331_PCI_LOWER_MEM_PA 0x80000000 #define IOP331_PCI_LOWER_MEM_BA (*IOP331_OMWTVR0) #define IOP331_PCI_UPPER_MEM_PA (IOP331_PCI_LOWER_MEM_PA + IOP331_PCI_MEM_WINDOW_SIZE - 1) |