Skip to content

L
linux
Commit b612cacb authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 7a91bf7f 71abe999
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
drivers/acorn/block/fd1772.c
View file @ b612cacb
...@@ -1283,8 +1283,7 @@ static void do_fd_request(request_queue_t* q) ...@@ -1283,8 +1283,7 @@ static void do_fd_request(request_queue_t* q)
if (fdc_busy) return; if (fdc_busy) return;
save_flags(flags); save_flags(flags);
cli(); cli();
while (fdc_busy) wait_event(fdc_wait, !fdc_busy);
sleep_on(&fdc_wait);
fdc_busy = 1; fdc_busy = 1;
ENABLE_IRQ(); ENABLE_IRQ();
restore_flags(flags); restore_flags(flags);
......
drivers/video/sa1100fb.c
View file @ b612cacb
...@@ -598,7 +598,7 @@ sa1100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, ...@@ -598,7 +598,7 @@ sa1100fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
* requests for the LCD controller. If we hit this, it means we're * requests for the LCD controller. If we hit this, it means we're
* doing nothing but LCD DMA. * doing nothing but LCD DMA.
*/ */
static unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var) static inline unsigned int sa1100fb_display_dma_period(struct fb_var_screeninfo *var)
{ {
/* /*
* Period = pixclock * bits_per_byte * bytes_per_transfer * Period = pixclock * bits_per_byte * bytes_per_transfer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7