diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
| commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
| tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/arch/sh/drivers | |
| parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) | |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/arch/sh/drivers')
| -rw-r--r-- | kernel/arch/sh/drivers/pci/ops-sh5.c | 1 | ||||
| -rw-r--r-- | kernel/arch/sh/drivers/pci/pci-sh4.h | 8 | ||||
| -rw-r--r-- | kernel/arch/sh/drivers/pci/pci-sh5.c | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/kernel/arch/sh/drivers/pci/ops-sh5.c b/kernel/arch/sh/drivers/pci/ops-sh5.c index 4ce95a001..453619464 100644 --- a/kernel/arch/sh/drivers/pci/ops-sh5.c +++ b/kernel/arch/sh/drivers/pci/ops-sh5.c @@ -18,7 +18,6 @@ #include <linux/delay.h> #include <linux/types.h> #include <linux/irq.h> -#include <asm/pci.h> #include <asm/io.h> #include "pci-sh5.h" diff --git a/kernel/arch/sh/drivers/pci/pci-sh4.h b/kernel/arch/sh/drivers/pci/pci-sh4.h index cbf763b30..0288efc17 100644 --- a/kernel/arch/sh/drivers/pci/pci-sh4.h +++ b/kernel/arch/sh/drivers/pci/pci-sh4.h @@ -11,14 +11,6 @@ #include <asm/io.h> -/* startup values */ -#define PCI_PROBE_BIOS 1 -#define PCI_PROBE_CONF1 2 -#define PCI_PROBE_CONF2 4 -#define PCI_NO_CHECKS 0x400 -#define PCI_ASSIGN_ROMS 0x1000 -#define PCI_BIOS_IRQ_SCAN 0x2000 - #define SH4_PCICR 0x100 /* PCI Control Register */ #define SH4_PCICR_PREFIX 0xA5000000 /* CR prefix for write */ #define SH4_PCICR_FTO 0x00000400 /* TRDY/IRDY Enable */ diff --git a/kernel/arch/sh/drivers/pci/pci-sh5.c b/kernel/arch/sh/drivers/pci/pci-sh5.c index 16c1e721b..8229114c6 100644 --- a/kernel/arch/sh/drivers/pci/pci-sh5.c +++ b/kernel/arch/sh/drivers/pci/pci-sh5.c @@ -20,7 +20,6 @@ #include <linux/types.h> #include <linux/irq.h> #include <cpu/irq.h> -#include <asm/pci.h> #include <asm/io.h> #include "pci-sh5.h" |