git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
[pandora-kernel.git]
/
arch
/
x86
/
platform
/
ce4100
/
falconfalls.dts
diff --git
a/arch/x86/platform/ce4100/falconfalls.dts
b/arch/x86/platform/ce4100/falconfalls.dts
index
dc701ea
..
2d6d226
100644
(file)
--- a/
arch/x86/platform/ce4100/falconfalls.dts
+++ b/
arch/x86/platform/ce4100/falconfalls.dts
@@
-74,6
+74,7
@@
compatible = "intel,ce4100-pci", "pci";
device_type = "pci";
bus-range = <1 1>;
compatible = "intel,ce4100-pci", "pci";
device_type = "pci";
bus-range = <1 1>;
+ reg = <0x0800 0x0 0x0 0x0 0x0>;
ranges = <0x2000000 0 0xdffe0000 0x2000000 0 0xdffe0000 0 0x1000>;
interrupt-parent = <&ioapic2>;
ranges = <0x2000000 0 0xdffe0000 0x2000000 0 0xdffe0000 0 0x1000>;
interrupt-parent = <&ioapic2>;
@@
-412,6
+413,7
@@
#address-cells = <2>;
#size-cells = <1>;
compatible = "isa";
#address-cells = <2>;
#size-cells = <1>;
compatible = "isa";
+ reg = <0xf800 0x0 0x0 0x0 0x0>;
ranges = <1 0 0 0 0 0x100>;
rtc@70 {
ranges = <1 0 0 0 0 0x100>;
rtc@70 {