From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751160Ab0IHEIE (ORCPT ); Wed, 8 Sep 2010 00:08:04 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:42921 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857Ab0IHEIC (ORCPT ); Wed, 8 Sep 2010 00:08:02 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=wOOGjX/dWXGSE7+67fZqxosOPk9NtQjwlPwwGLVSW4KsT6WOvaqpl/M8LVjyJxOgHq KOxq0N+fdL2eIW68S80sDyjjmrKzrmfyraueT4todNwL+FYExPyHtcW+SKguI2+fBVuM Hb2FoFEvJNIbuKdLQVgQkz5ywtt6Ck+/toX64= Subject: [PATCH 2/2 v2] staging : xgifb: Removes compilation conditionals From: Javier Martinez Canillas To: Greg Kroah-Hartman , Bill Pemberton , Arnaud Patard , Randy Dunlap , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Date: Wed, 08 Sep 2010 00:07:57 -0400 Message-ID: <1283918877.4905.5.camel@lenovo> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes a compilation warning in today linux-next removing some compilation conditionals. Signed-off-by: Javier Martinez Canillas --- drivers/staging/xgifb/XGI_main_26.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index dbce3d0..4f73d09 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void) } -#ifndef MODULE XGIINITSTATIC int __init XGIfb_setup(char *options) { char *this_opt; @@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) printk("\nxgifb: outa xgifb_setup 3450"); return 0; } -#endif static unsigned char VBIOS_BUF[65535]; @@ -3454,13 +3452,12 @@ static struct pci_driver xgifb_driver = { XGIINITSTATIC int __init xgifb_init(void) { -#ifndef MODULE char *option = NULL; if (fb_get_options("xgifb", &option)) return -ENODEV; XGIfb_setup(option); -#endif + return pci_register_driver(&xgifb_driver); } -- 1.7.0.4