diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 10:01:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 10:01:28 -0800 |
| commit | 0cf975e16927fd70f34cee20d3856246c13bb4c8 (patch) | |
| tree | bb955d50f28e5d98c198701798c8341d9763299a /include/asm-cris/io.h | |
| parent | 03054de1e0b90b33e9974107d84dabd2509f5898 (diff) | |
| parent | bc10ac3f2fe44e65f787d6197fd5d17304bf7d83 (diff) | |
Merge branch 'cris' of git://www.jni.nu/cris
* 'cris' of git://www.jni.nu/cris: (158 commits)
CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific.
CRIS v32: Change drivers/i2c.c locking.
CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.
CRIS: Add new timerfd syscall entries.
MAINTAINERS: Add my information for the CRIS port.
CRIS v32: Correct spelling of bandwidth in function name.
CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.
CRIS v10: Cleanup of drivers/gpio.c
CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash.
CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h
CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.
CRIS: Drop regs parameter from call to profile_tick in kernel/time.c
CRIS v32: Fix minor formatting issue in mach-a3/io.c
CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S
CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.
CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h
CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory.
CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h
CRIS v32: Move register map header to machine dependent directory.
CRIS v32: Let compiler know that memory is clobbered after a break op.
...
Diffstat (limited to 'include/asm-cris/io.h')
| -rw-r--r-- | include/asm-cris/io.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-cris/io.h b/include/asm-cris/io.h index d196dd6b2df..b87ce63f531 100644 --- a/include/asm-cris/io.h +++ b/include/asm-cris/io.h @@ -122,8 +122,8 @@ static inline void writel(unsigned int b, volatile void __iomem *addr) #define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) -/* The following is junk needed for the arch-independent code but which - * we never use in the CRIS port +/* I/O port access. Normally there is no I/O space on CRIS but when + * Cardbus/PCI is enabled the request is passed through the bridge. */ #define IO_SPACE_LIMIT 0xffff |