diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-04-18 11:18:55 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-04-18 11:18:55 +0200 |
| commit | 9938b04472d5c59f8bd8152a548533a8599596a2 (patch) | |
| tree | 0fc8318100878c5e446076613ec02a97aa179119 /arch/arm/mach-ks8695/devices.c | |
| parent | bd7ced98812dbb906950d8b0ec786f14f631cede (diff) | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.gz linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.bz2 linux-9938b04472d5c59f8bd8152a548533a8599596a2.zip | |
Merge branch 'master' into for-next
Sync with Linus' tree so that patches against newer codebase can be applied.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'arch/arm/mach-ks8695/devices.c')
| -rw-r--r-- | arch/arm/mach-ks8695/devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c index 47399bc3c024..61cf20beb45f 100644 --- a/arch/arm/mach-ks8695/devices.c +++ b/arch/arm/mach-ks8695/devices.c @@ -24,9 +24,9 @@ #include <linux/platform_device.h> #include <mach/irqs.h> -#include <mach/regs-wan.h> -#include <mach/regs-lan.h> -#include <mach/regs-hpna.h> +#include "regs-wan.h" +#include "regs-lan.h" +#include "regs-hpna.h" #include <mach/regs-switch.h> #include <mach/regs-misc.h> |