Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756032Ab1BXJdg (ORCPT ); Thu, 24 Feb 2011 04:33:36 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:42091 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755862Ab1BXJde (ORCPT ); Thu, 24 Feb 2011 04:33:34 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=eKxhNBHIwuGNTBWwA5jkSvWTfoYNr0nYAdlt7C+NPhC7YZT9kHDQ4FCXjNZUvwCqAX aUw5Qp+pM+nGEYmWePR1+TkWQCI5A3/uLNGtYtvEBk7OeSI9X3eZP7iF8TTDX/CFWEjh zAD38hiQXFui4EMBAO7GDGzcuE86FtdJvjfOU= From: Marek Belisko To: gregkh@suse.de Cc: alan@linux.intel.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Marek Belisko Subject: [PATCH] staging: gma500: Fix compilation error. Date: Thu, 24 Feb 2011 10:33:18 +0100 Message-Id: <1298539998-6422-1-git-send-email-marek.belisko@open-nandra.com> X-Mailer: git-send-email 1.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4285 Lines: 96 This patch will fix following compilation error: drivers/staging/gma500/psb_drv.c:1635: error: unknown field ‘pci_driver’ specified in initializer drivers/staging/gma500/psb_drv.c:1636: error: unknown field ‘name’ specified in initializer drivers/staging/gma500/psb_drv.c:1636: warning: initialization from incompatible pointer type drivers/staging/gma500/psb_drv.c:1637: error: unknown field ‘id_table’ specified in initializer drivers/staging/gma500/psb_drv.c:1637: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1637: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1638: error: unknown field ‘resume’ specified in initializer drivers/staging/gma500/psb_drv.c:1638: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1638: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1639: error: unknown field ‘suspend’ specified in initializer drivers/staging/gma500/psb_drv.c:1639: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1639: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1640: error: unknown field ‘probe’ specified in initializer drivers/staging/gma500/psb_drv.c:1640: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1640: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1641: error: unknown field ‘remove’ specified in initializer drivers/staging/gma500/psb_drv.c:1641: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1641: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c:1643: error: unknown field ‘driver’ specified in initializer drivers/staging/gma500/psb_drv.c:1643: warning: excess elements in union initializer drivers/staging/gma500/psb_drv.c:1643: warning: (near initialization for ‘driver.kdriver’) drivers/staging/gma500/psb_drv.c: In function ‘psb_init’: drivers/staging/gma500/psb_drv.c:1664: error: implicit declaration of function ‘drm_init’ drivers/staging/gma500/psb_drv.c: In function ‘psb_exit’: drivers/staging/gma500/psb_drv.c:1669: error: implicit declaration of function ‘drm_exit’ Signed-off-by: Marek Belisko --- drivers/staging/gma500/psb_drv.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index 2fe09c8..caa5140 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -1632,17 +1632,6 @@ static struct drm_driver driver = { .fasync = drm_fasync, .read = drm_read, }, - .pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - .resume = ospm_power_resume, - .suspend = ospm_power_suspend, - .probe = psb_probe, - .remove = psb_remove, -#ifdef CONFIG_PM - .driver.pm = &psb_pm_ops, -#endif - }, .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = PSB_DRM_DRIVER_DATE, @@ -1651,6 +1640,18 @@ static struct drm_driver driver = { .patchlevel = PSB_DRM_DRIVER_PATCHLEVEL }; +static struct pci_driver psb_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, + .resume = ospm_power_resume, + .suspend = ospm_power_suspend, + .probe = psb_probe, + .remove = psb_remove, +#ifdef CONFIG_PM + .driver.pm = &psb_pm_ops, +#endif +}; + static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { /* MLD Added this from Inaky's patch */ @@ -1661,12 +1662,12 @@ static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init psb_init(void) { - return drm_init(&driver); + return drm_pci_init(&driver, &psb_pci_driver); } static void __exit psb_exit(void) { - drm_exit(&driver); + drm_pci_exit(&driver, &psb_pci_driver); } late_initcall(psb_init); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/