clean up Avila/Cambria patches
SVN-Revision: 11254
This commit is contained in:
parent
cdd03b171d
commit
6454a87560
3 changed files with 141 additions and 142 deletions
|
@ -129,7 +129,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
|
+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
|
||||||
@@ -0,0 +1,445 @@
|
@@ -0,0 +1,444 @@
|
||||||
+/*
|
+/*
|
||||||
+ * arch/arm/mach-ixp4xx/cambria-setup.c
|
+ * arch/arm/mach-ixp4xx/cambria-setup.c
|
||||||
+ *
|
+ *
|
||||||
|
@ -385,26 +385,25 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/cambria-setup.c
|
||||||
+static struct platform_device cambria_usb0_device = {
|
+static struct platform_device cambria_usb0_device = {
|
||||||
+ .name = "ixp4xx-ehci",
|
+ .name = "ixp4xx-ehci",
|
||||||
+ .id = 0,
|
+ .id = 0,
|
||||||
|
+ .resource = cambria_usb0_resources,
|
||||||
|
+ .num_resources = ARRAY_SIZE(cambria_usb0_resources),
|
||||||
+ .dev = {
|
+ .dev = {
|
||||||
+ .dma_mask = &ehci_dma_mask,
|
+ .dma_mask = &ehci_dma_mask,
|
||||||
+ .coherent_dma_mask = 0xffffffff,
|
+ .coherent_dma_mask = 0xffffffff,
|
||||||
+ },
|
+ },
|
||||||
+ .resource = cambria_usb0_resources,
|
|
||||||
+ .num_resources = 2,
|
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+static struct platform_device cambria_usb1_device = {
|
+static struct platform_device cambria_usb1_device = {
|
||||||
+ .name = "ixp4xx-ehci",
|
+ .name = "ixp4xx-ehci",
|
||||||
+ .id = 1,
|
+ .id = 1,
|
||||||
|
+ .resource = cambria_usb1_resources,
|
||||||
|
+ .num_resources = ARRAY_SIZE(cambria_usb1_resources),
|
||||||
+ .dev = {
|
+ .dev = {
|
||||||
+ .dma_mask = &ehci_dma_mask,
|
+ .dma_mask = &ehci_dma_mask,
|
||||||
+ .coherent_dma_mask = 0xffffffff,
|
+ .coherent_dma_mask = 0xffffffff,
|
||||||
+ },
|
+ },
|
||||||
+ .resource = cambria_usb1_resources,
|
|
||||||
+ .num_resources = 2,
|
|
||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+
|
|
||||||
+static struct platform_device *cambria_devices[] __initdata = {
|
+static struct platform_device *cambria_devices[] __initdata = {
|
||||||
+ &cambria_i2c_gpio,
|
+ &cambria_i2c_gpio,
|
||||||
+ &cambria_flash,
|
+ &cambria_flash,
|
||||||
|
|
Loading…
Reference in a new issue