The following commit has been merged in the linux branch: commit 9d09daf8e891e6ed60f96fbaf765ba7bced8bad1 Author: Haavard Skinnemoen haavard.skinnemoen@atmel.com Date: Mon Oct 26 16:50:02 2009 -0700

atmel_serial: fix bad BUILD_BUG_ON() usage

is_power_of_2() appears not to be constant enough for BUILD_BUG_ON() after the latest rework, so replace it with an open-coded test.

Signed-off-by: Haavard Skinnemoen haavard.skinnemoen@atmel.com Cc: Uwe Kleine-König u.kleine-koenig@pengutronix.de Cc: Jan Beulich jbeulich@novell.com Cc: Haavard Skinnemoen hskinnemoen@atmel.com Cc: Alan Cox alan@linux.intel.com Cc: Nicolas Ferre nicolas.ferre@atmel.com Cc: Claudio Scordino claudio@evidence.eu.com Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 3551c5c..9d948bc 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -1531,7 +1531,7 @@ static int __devinit atmel_serial_probe(struct platform_device *pdev) void *data; int ret;

- BUILD_BUG_ON(!is_power_of_2(ATMEL_SERIAL_RINGSIZE)); + BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));

port = &atmel_ports[pdev->id]; port->backup_imr = 0;