[kernel] olpc: cleanup config

[openwrt.git] / target / linux / adm5120 / patches-2.6.30 / 800-adm5120-remove-amba-bus-id.patch

diff --git a/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch b/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
index e2435fb..6be70ca 100644 (file)
--- a/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
+++ b/target/linux/adm5120/patches-2.6.30/800-adm5120-remove-amba-bus-id.patch
@@ -1,18 +1,20 @@
 --- a/arch/mips/adm5120/common/platform.c
 +++ b/arch/mips/adm5120/common/platform.c
 --- a/arch/mips/adm5120/common/platform.c
 +++ b/arch/mips/adm5120/common/platform.c

-@@ -190,7 +190,6 @@ struct amba_pl010_data adm5120_uart0_dat
+@@ -190,7 +190,7 @@ struct amba_pl010_data adm5120_uart0_dat

  
  struct amba_device adm5120_uart0_device = {
        .dev            = {
 -              .bus_id = "APB:UART0",
  
  struct amba_device adm5120_uart0_device = {
        .dev            = {
 -              .bus_id = "APB:UART0",

++              .init_name = "apb:uart0",

                .platform_data = &adm5120_uart0_data,
        },
        .res            = {
                .platform_data = &adm5120_uart0_data,
        },
        .res            = {

-@@ -208,7 +207,6 @@ struct amba_pl010_data adm5120_uart1_dat
+@@ -208,7 +208,7 @@ struct amba_pl010_data adm5120_uart1_dat

  
  struct amba_device adm5120_uart1_device = {
        .dev            = {
 -              .bus_id = "APB:UART1",
  
  struct amba_device adm5120_uart1_device = {
        .dev            = {
 -              .bus_id = "APB:UART1",

++              .init_name = "apb:uart1",

                .platform_data = &adm5120_uart1_data,
        },
        .res            = {
                .platform_data = &adm5120_uart1_data,
        },
        .res            = {