Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[mv-sheeva.git] / include / asm-arm / arch-omap / mailbox.h

diff --git a/include/asm-arm/arch-omap/mailbox.h b/include/asm-arm/arch-omap/mailbox.h
index 4bf0909461f2b0f14a4f0a6f336911bdbe7f8e5e..7cbed9332e169f36854349048051cf02b979144e 100644 (file)
--- a/include/asm-arm/arch-omap/mailbox.h
+++ b/include/asm-arm/arch-omap/mailbox.h
@@ -37,7 +37,7 @@ struct omap_mbox_ops {
 
 struct omap_mbox_queue {
        spinlock_t              lock;
-       request_queue_t         *queue;
+       struct request_queue    *queue;
        struct work_struct      work;
        int     (*callback)(void *);
        struct omap_mbox        *mbox;