Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b612cacb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 7a91bf7f 71abe999

drivers/acorn/block/fd1772.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/video/sa1100fb.c

+1 −1
Original line number Diff line number Diff line
@@ -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