From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752638AbZJZPMp (ORCPT ); Mon, 26 Oct 2009 11:12:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752569AbZJZPMo (ORCPT ); Mon, 26 Oct 2009 11:12:44 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:48510 "EHLO opensource2.wolfsonmicro.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752279AbZJZPMo (ORCPT ); Mon, 26 Oct 2009 11:12:44 -0400 From: Mark Brown To: Haavard Skinnemoen , Alan Cox Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH 2.6.32] drivers/serial/atmel_serial.c: Fix BUILD_BUG_ON build Date: Mon, 26 Oct 2009 15:12:44 +0000 Message-Id: <1256569964-14416-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.6.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since 'BUILD_BUG_ON(): fix it and a couple of bogus uses of it' (commit 8c87df45) the BUILD_BUG_ON() for the ring buffer size has failed to build due to use of is_power_of_2(). Fix this in the same way as the SPARC vio.h was fixed in that commit by converting to MAYBE_BUILD_BUG_ON(). Signed-off-by: Mark Brown --- drivers/serial/atmel_serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index 3551c5c..b37d75f 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)); + MAYBE_BUILD_BUG_ON(!is_power_of_2(ATMEL_SERIAL_RINGSIZE)); port = &atmel_ports[pdev->id]; port->backup_imr = 0; -- 1.6.5