summaryrefslogtreecommitdiff
path: root/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2006-02-21 03:22:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-21 03:22:39 +0000
commitf82d311edcd0d921e508404dbc1f100f8007ad91 (patch)
tree41e4feb7cc92d7460481a5438e8e9b66206bc845 /packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
parent57bea1c07deb3ab6748fd7340f30b0a97bc44ee4 (diff)
parent434850c46ea25407707b3da17ebdd642bd577fa4 (diff)
merge of 1e7d948f0d03b427916f50dc6a5f9379b1d40f75
and 362abe3a84010b7c14f779ccec407601248db7db
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
index 8940bd63a6..46556f7cee 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
@@ -1,7 +1,9 @@
-diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c
---- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-10 22:31:00.000000000 +0100
-@@ -0,0 +1,69 @@
+ arch/arm/mach-ixp4xx/ds101-pci.c | 68 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 68 insertions(+)
+
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-ixp4xx/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-11 16:27:21.000000000 +0100
+@@ -0,0 +1,68 @@
+/*
+ * arch/arm/mach-ixp4xx/ds101-pci.c
+ *
@@ -40,8 +42,7 @@ diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/ar
+ static int pci_irq_table[DS101_PCI_MAX_DEV][DS101_PCI_IRQ_LINES] =
+ {
+ { IRQ_DS101_PCI_INTA, -1, -1 },
-+ { IRQ_DS101_PCI_INTB, -1, -1 },
-+ { IRQ_DS101_PCI_INTC, -1, -1 },
++ { IRQ_DS101_PCI_INTB, IRQ_DS101_PCI_INTB, IRQ_DS101_PCI_INTC },
+ };
+
+ int irq = -1;