diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/asm-generic/delay.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/asm-generic/delay.h')
| -rw-r--r-- | include/asm-generic/delay.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-generic/delay.h b/include/asm-generic/delay.h new file mode 100644 index 000000000000..4586fec75ddb --- /dev/null +++ b/include/asm-generic/delay.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #ifndef __ASM_GENERIC_DELAY_H | ||
| 2 | #define __ASM_GENERIC_DELAY_H | ||
| 3 | |||
| 4 | extern void __udelay(unsigned long usecs); | ||
| 5 | extern void __delay(unsigned long loops); | ||
| 6 | |||
| 7 | #define udelay(n) __udelay(n) | ||
| 8 | |||
| 9 | #endif /* __ASM_GENERIC_DELAY_H */ | ||