diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 00:57:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-04 00:57:06 -0400 |
| commit | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 (patch) | |
| tree | 2ec107d486a57584f2b4ae431e70abbc11661d68 /arch/m32r/lib/delay.c | |
| parent | 0b5759c654e74c8dc317ea2c6b3a7476160f688a (diff) | |
| parent | 0a3d31b79e7fa600108e699805e2b2f9ea1f3194 (diff) | |
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r: Fix IPI function calls for SMP
m32r: Fix set_memory() for DISCONTIGMEM
m32r: add rtc_lock variable
m32r: define ioread* and iowrite* macros
m32r: export delay loop symbols
m32r: fix tme_handler
Diffstat (limited to 'arch/m32r/lib/delay.c')
| -rw-r--r-- | arch/m32r/lib/delay.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m32r/lib/delay.c b/arch/m32r/lib/delay.c index ced549be80f5..940f4837e42b 100644 --- a/arch/m32r/lib/delay.c +++ b/arch/m32r/lib/delay.c | |||
| @@ -122,4 +122,8 @@ void __ndelay(unsigned long nsecs) | |||
| 122 | { | 122 | { |
| 123 | __const_udelay(nsecs * 0x00005); /* 2**32 / 1000000000 (rounded up) */ | 123 | __const_udelay(nsecs * 0x00005); /* 2**32 / 1000000000 (rounded up) */ |
| 124 | } | 124 | } |
| 125 | |||
| 126 | EXPORT_SYMBOL(__delay); | ||
| 127 | EXPORT_SYMBOL(__const_udelay); | ||
| 128 | EXPORT_SYMBOL(__udelay); | ||
| 125 | EXPORT_SYMBOL(__ndelay); | 129 | EXPORT_SYMBOL(__ndelay); |