diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/plat-omap/mailbox.c | 8 | ||||
| -rw-r--r-- | arch/um/drivers/ubd_kern.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c index de7e6ef48bd0..0360b1f14d11 100644 --- a/arch/arm/plat-omap/mailbox.c +++ b/arch/arm/plat-omap/mailbox.c | |||
| @@ -161,11 +161,11 @@ static void mbox_rx_work(struct work_struct *work) | |||
| 161 | /* | 161 | /* |
| 162 | * Mailbox interrupt handler | 162 | * Mailbox interrupt handler |
| 163 | */ | 163 | */ |
| 164 | static void mbox_txq_fn(request_queue_t * q) | 164 | static void mbox_txq_fn(struct request_queue * q) |
| 165 | { | 165 | { |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | static void mbox_rxq_fn(request_queue_t * q) | 168 | static void mbox_rxq_fn(struct request_queue * q) |
| 169 | { | 169 | { |
| 170 | } | 170 | } |
| 171 | 171 | ||
| @@ -180,7 +180,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox) | |||
| 180 | { | 180 | { |
| 181 | struct request *rq; | 181 | struct request *rq; |
| 182 | mbox_msg_t msg; | 182 | mbox_msg_t msg; |
| 183 | request_queue_t *q = mbox->rxq->queue; | 183 | struct request_queue *q = mbox->rxq->queue; |
| 184 | 184 | ||
| 185 | disable_mbox_irq(mbox, IRQ_RX); | 185 | disable_mbox_irq(mbox, IRQ_RX); |
| 186 | 186 | ||
| @@ -297,7 +297,7 @@ static struct omap_mbox_queue *mbox_queue_alloc(struct omap_mbox *mbox, | |||
| 297 | request_fn_proc * proc, | 297 | request_fn_proc * proc, |
| 298 | void (*work) (struct work_struct *)) | 298 | void (*work) (struct work_struct *)) |
| 299 | { | 299 | { |
| 300 | request_queue_t *q; | 300 | struct request_queue *q; |
| 301 | struct omap_mbox_queue *mq; | 301 | struct omap_mbox_queue *mq; |
| 302 | 302 | ||
| 303 | mq = kzalloc(sizeof(struct omap_mbox_queue), GFP_KERNEL); | 303 | mq = kzalloc(sizeof(struct omap_mbox_queue), GFP_KERNEL); |
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index fc27f6c72b41..aff661fe2ee1 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
| @@ -469,7 +469,7 @@ __uml_help(fakehd, | |||
| 469 | " Change the ubd device name to \"hd\".\n\n" | 469 | " Change the ubd device name to \"hd\".\n\n" |
| 470 | ); | 470 | ); |
| 471 | 471 | ||
| 472 | static void do_ubd_request(request_queue_t * q); | 472 | static void do_ubd_request(struct request_queue * q); |
| 473 | 473 | ||
| 474 | /* Only changed by ubd_init, which is an initcall. */ | 474 | /* Only changed by ubd_init, which is an initcall. */ |
| 475 | int thread_fd = -1; | 475 | int thread_fd = -1; |
| @@ -1081,7 +1081,7 @@ static void prepare_request(struct request *req, struct io_thread_req *io_req, | |||
| 1081 | } | 1081 | } |
| 1082 | 1082 | ||
| 1083 | /* Called with dev->lock held */ | 1083 | /* Called with dev->lock held */ |
| 1084 | static void do_ubd_request(request_queue_t *q) | 1084 | static void do_ubd_request(struct request_queue *q) |
| 1085 | { | 1085 | { |
| 1086 | struct io_thread_req *io_req; | 1086 | struct io_thread_req *io_req; |
| 1087 | struct request *req; | 1087 | struct request *req; |
