diff options
author | Rod Whitby <rod@whitby.id.au> | 2006-02-21 02:16:42 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-21 02:16:42 +0000 |
commit | 434850c46ea25407707b3da17ebdd642bd577fa4 (patch) | |
tree | c88056b417da89558faf77df708c459bbcbf587c /packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch | |
parent | cbde8cbe425ff9c1d24c009a6a785327d8bbee5b (diff) | |
parent | 3c492671634a9273b4e79b8c4b1f03039002d47e (diff) |
merge of e2df25d795a5c294e29cab1435249894afc5d4ef
and f0d5ff25a7f07c6a141dcc2b5a933a3c36e93695
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.patch | 13 |
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; |