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 'devel-stable' into devel

Browse Source 
Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
This commit is contained in:
Russell King
2010-05-17 17:24:04 +01:00
parent fda0e18c8a a3685f0065
commit ac1d426e82
5500 changed files with 78800 additions and 18040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/amba/bus.h
+3
View File
@@ -14,6 +14,9 @@
#ifndef ASMARM_AMBA_H
#define ASMARM_AMBA_H
#include <linux/device.h>
#include <linux/resource.h>
#define AMBA_NR_IRQS 2
struct amba_device {
include/linux/amba/pl061.h
+2
View File
@@ -1,3 +1,5 @@
#include <linux/types.h>
/* platform data for the PL061 GPIO driver */
struct pl061_platform_data {