Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Linus Torvalds 2005-08-08 12:19:24 -07:00
commit b612cacb02
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/acorn/block/fd1772.c
View file

@ -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);

2
drivers/video/sa1100fb.c
View file

@ -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