diff options
| author | Arnd Bergmann | 2012-01-03 22:22:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-01-03 22:22:46 +0100 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /drivers/gpio/gpio-pl061.c | |
| parent | Merge branch 'pxa/board' into next/boards (diff) | |
| parent | Merge branch 'imx-features-assorted' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.gz kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.xz kernel-qcow2-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.zip | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/gpio/gpio-pl061.c')
| -rw-r--r-- | drivers/gpio/gpio-pl061.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c index 093c90bd3c1d..4102f63230fd 100644 --- a/drivers/gpio/gpio-pl061.c +++ b/drivers/gpio/gpio-pl061.c @@ -238,10 +238,6 @@ static int pl061_probe(struct amba_device *dev, const struct amba_id *id) int ret, irq, i; static DECLARE_BITMAP(init_irq, NR_IRQS); - pdata = dev->dev.platform_data; - if (pdata == NULL) - return -ENODEV; - chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (chip == NULL) return -ENOMEM; |