diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:25:14 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-06 15:25:14 +1100 |
commit | b14fb0a1a1dba3709648fc19dd52350a4aa685b5 (patch) | |
tree | 8f5028a7979ed1cdb20dcc1b98f37661cb968971 /include | |
parent | f87c74e9f4ab1cb1df7f95ac8dcadecefd76270f (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 */ |