apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misc' into devel

Browse Source 
Conflicts:
	arch/arm/mm/init.c
This commit is contained in:
Russell King
2010-07-31 14:20:02 +01:00
parent b31fc7af78 08458ef6ee
commit ceb0885d3b
60 changed files with 475 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpio/pl061.c
+2 -2
View File
@@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
desc->chip->unmask(irq);
}
static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
static int pl061_probe(struct amba_device *dev, struct amba_id *id)
{
struct pl061_platform_data *pdata;
struct pl061_gpio *chip;
@@ -333,7 +333,7 @@ free_mem:
return ret;
}
static struct amba_id pl061_ids[] __initdata = {
static struct amba_id pl061_ids[] = {
{
.id = 0x00041061,
.mask = 0x000fffff,