From c8781f3c64c88997193ac6876721d0a5596e4ef7 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 12 Nov 2012 14:46:48 +0800 Subject: [PATCH] --- yaml --- r: 336414 b: refs/heads/master c: 72facfea710afc7165e8f2fedd2e048098960b7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-pxa3xx.c | 2 -- trunk/drivers/pinctrl/pinctrl-pxa3xx.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eaf96addf13f..bf02bee5310a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9387760db221420f56a9f43a7d079c9fb209e32e +refs/heads/master: 72facfea710afc7165e8f2fedd2e048098960b7e diff --git a/trunk/drivers/pinctrl/pinctrl-pxa3xx.c b/trunk/drivers/pinctrl/pinctrl-pxa3xx.c index 43e3dd058ddb..51f8a388b917 100644 --- a/trunk/drivers/pinctrl/pinctrl-pxa3xx.c +++ b/trunk/drivers/pinctrl/pinctrl-pxa3xx.c @@ -187,8 +187,6 @@ int pxa3xx_pinctrl_register(struct platform_device *pdev, res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) return -ENOENT; - info->phy_base = res->start; - info->phy_size = resource_size(res); info->virt_base = devm_request_and_ioremap(&pdev->dev, res); if (!info->virt_base) return -ENOMEM; diff --git a/trunk/drivers/pinctrl/pinctrl-pxa3xx.h b/trunk/drivers/pinctrl/pinctrl-pxa3xx.h index 8135744d6599..92fad0880834 100644 --- a/trunk/drivers/pinctrl/pinctrl-pxa3xx.h +++ b/trunk/drivers/pinctrl/pinctrl-pxa3xx.h @@ -60,8 +60,6 @@ struct pxa3xx_pinmux_info { struct device *dev; struct pinctrl_dev *pctrl; enum pxa_cpu_type cputype; - unsigned int phy_base; - unsigned int phy_size; void __iomem *virt_base; struct pxa3xx_mfp_pin *mfp;