aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 12:26:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-24 12:26:44 -0700
commitb2e961eb2e7a54ffaae82f8e0198b26b54ade98e (patch)
tree33e5192a4c84e717d8c2f8235f268216b01053f7 /include/asm-arm
parentb8c1c5da1520977cb55a358f20fc09567d40cad9 (diff)
parent71f65e6bd7651610d2d6aeb3c12aab63667ace30 (diff)
Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-block
* 'request-queue-t' of git://git.kernel.dk/linux-2.6-block: [BLOCK] Add request_queue_t and mark it deprecated [BLOCK] Get rid of request_queue_t typedef
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-omap/mailbox.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/mailbox.h b/include/asm-arm/arch-omap/mailbox.h
index 4bf0909461f..7cbed9332e1 100644
--- 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;