diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 12:19:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-08 12:19:24 -0700 |
| commit | b612cacb02f0fb58f07a9002c7719a901882718c (patch) | |
| tree | f528e2ee1b39ad3c70336b29469d0b5645bc9e97 | |
| parent | 7a91bf7f5c22c8407a9991cbd9ce5bb87caa6b4a (diff) | |
| parent | 71abe99980e6d7ff8aee8acc7da817b3ad7d8a89 (diff) | |
| download | blackbird-op-linux-b612cacb02f0fb58f07a9002c7719a901882718c.tar.gz blackbird-op-linux-b612cacb02f0fb58f07a9002c7719a901882718c.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | drivers/acorn/block/fd1772.c | 3 | ||||
| -rw-r--r-- | drivers/video/sa1100fb.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c index 3cd2e968e96c..c0a37d98b4f3 100644 --- a/drivers/acorn/block/fd1772.c +++ b/drivers/acorn/block/fd1772.c @@ -1283,8 +1283,7 @@ static void do_fd_request(request_queue_t* q) if (fdc_busy) return; save_flags(flags); cli(); - while (fdc_busy) - sleep_on(&fdc_wait); + wait_event(fdc_wait, !fdc_busy); fdc_busy = 1; ENABLE_IRQ(); restore_flags(flags); diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 2d29db7ef800..beeec7b51425 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c @@ -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 * 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 |
