diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:02 -0400 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /drivers/gpio | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/pl061.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c index ee568c8fcbd0..5005990f751f 100644 --- a/drivers/gpio/pl061.c +++ b/drivers/gpio/pl061.c | |||
| @@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc) | |||
| 232 | desc->chip->unmask(irq); | 232 | desc->chip->unmask(irq); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static int __init pl061_probe(struct amba_device *dev, struct amba_id *id) | 235 | static int pl061_probe(struct amba_device *dev, struct amba_id *id) |
| 236 | { | 236 | { |
| 237 | struct pl061_platform_data *pdata; | 237 | struct pl061_platform_data *pdata; |
| 238 | struct pl061_gpio *chip; | 238 | struct pl061_gpio *chip; |
| @@ -333,7 +333,7 @@ free_mem: | |||
| 333 | return ret; | 333 | return ret; |
| 334 | } | 334 | } |
| 335 | 335 | ||
| 336 | static struct amba_id pl061_ids[] __initdata = { | 336 | static struct amba_id pl061_ids[] = { |
| 337 | { | 337 | { |
| 338 | .id = 0x00041061, | 338 | .id = 0x00041061, |
| 339 | .mask = 0x000fffff, | 339 | .mask = 0x000fffff, |