diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:19:50 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 14:19:50 +0000 |
| commit | 90c7aee3617913742298b3e861fc139314e20ae6 (patch) | |
| tree | a9c06e7fadcc56479ccaf560b100b2440a29724b /arch/arm/mach-ux500/include/mach/mbox-db5500.h | |
| parent | e3cdaa3535ace42f553684d9cff72f05faf24df2 (diff) | |
| parent | fbdfb62fca47323f1bd3d9b2862d10cd6fc1b334 (diff) | |
Automatically merging tracking-igloo_kernel-modem into merge-integration-linux-ux500
Conflicting files:
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/mbox-db5500.h')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/mbox-db5500.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/include/mach/mbox-db5500.h b/arch/arm/mach-ux500/include/mach/mbox-db5500.h index 7f9da4d2fbd..24af854befe 100644 --- a/arch/arm/mach-ux500/include/mach/mbox-db5500.h +++ b/arch/arm/mach-ux500/include/mach/mbox-db5500.h @@ -40,6 +40,7 @@ typedef void mbox_recv_cb_t (u32 mbox_msg, void *priv); * @lock: Spinlock to protect this mailbox instance. * @write_index: Index in internal buffer to write to. * @read_index: Index in internal buffer to read from. + * @irq: mailbox interrupt. * @allocated: Indicates whether this particular mailbox * id has been allocated by someone. */ @@ -57,7 +58,11 @@ struct mbox { spinlock_t lock; u8 write_index; u8 read_index; + int irq; bool allocated; +#if defined(CONFIG_DEBUG_FS) + struct dentry *dentry; +#endif }; /** |