diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 12:14:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-30 12:14:04 +1100 |
| commit | abd805800be0471ea9f0e9553fe525c03f52cb0e (patch) | |
| tree | 5348369cf4d70df7017598a2c66015813e3678f7 /include | |
| parent | 54a68f0fbea1b6ee7a755933f504b6ddb56dc594 (diff) | |
| parent | 63d5e5a727240b317b0c2fa2abeb32b367aea196 (diff) | |
Merge remote branch 'staging/staging-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rar_register.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/rar_register.h b/include/linux/rar_register.h index ffa805780f85..5c6118189363 100644 --- a/include/linux/rar_register.h +++ b/include/linux/rar_register.h @@ -34,11 +34,27 @@ struct rar_device; +#if defined(CONFIG_RAR_REGISTER) int register_rar(int num, int (*callback)(unsigned long data), unsigned long data); void unregister_rar(int num); int rar_get_address(int rar_index, dma_addr_t *start, dma_addr_t *end); int rar_lock(int rar_index); +#else +extern void unregister_rar(int num) { } +extern int rar_lock(int rar_index) { return -EIO; } + +extern inline int register_rar(int num, + int (*callback)(unsigned long data), unsigned long data) +{ + return -ENODEV; +} + +extern int rar_get_address(int rar_index, dma_addr_t *start, dma_addr_t *end) +{ + return -ENODEV; +} +#endif /* RAR_REGISTER */ #endif /* __KERNEL__ */ #endif /* _RAR_REGISTER_H */ |