diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 15:07:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-29 15:07:19 -0700 |
| commit | a6ab948e6500306dcb415ec80bff5f9b93f41b90 (patch) | |
| tree | 7c5d934ae840835b63dd38dbeb47adfc40927648 /arch/x86/platform/ce4100/falconfalls.dts | |
| parent | 592311c91daece7d6503bdef8fcc434f829aad23 (diff) | |
| parent | 1ff42c32c7614c2e810ed388fd1ba04a5626b74c (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: ce4100: Configure IOAPIC pins for USB and SATA to level type
x86: devicetree: Configure IOAPIC pin only once
x86, setup: When probing memory with e801, use ax/bx as a pair
Diffstat (limited to 'arch/x86/platform/ce4100/falconfalls.dts')
| -rw-r--r-- | arch/x86/platform/ce4100/falconfalls.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/platform/ce4100/falconfalls.dts b/arch/x86/platform/ce4100/falconfalls.dts index 2d6d226f2b1..e70be38ce03 100644 --- a/arch/x86/platform/ce4100/falconfalls.dts +++ b/arch/x86/platform/ce4100/falconfalls.dts @@ -347,7 +347,7 @@ "pciclass0c03"; reg = <0x16800 0x0 0x0 0x0 0x0>; - interrupts = <22 3>; + interrupts = <22 1>; }; usb@d,1 { @@ -357,7 +357,7 @@ "pciclass0c03"; reg = <0x16900 0x0 0x0 0x0 0x0>; - interrupts = <22 3>; + interrupts = <22 1>; }; sata@e,0 { @@ -367,7 +367,7 @@ "pciclass0106"; reg = <0x17000 0x0 0x0 0x0 0x0>; - interrupts = <23 3>; + interrupts = <23 1>; }; flash@f,0 { |