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 12:23:39 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-21 12:23:39 +0000
commit021e339c349f6a37357c942b2ad56c00ec4dfbb8 (patch)
tree38965fbda156fb85620ab3c0729ab46a70c2f215 /packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch
parentdded9843fdbecb2543960c1a1bb58d879f2d3701 (diff)
parentf82d311edcd0d921e508404dbc1f100f8007ad91 (diff)
merge of c05500f989033c95b9140a0af0e80c12779ee62d
and d46341ca553d7906dd18e7869e24f37f7e7c1590
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;