adm5120: merge 2.6.30+ specific patches

[openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / common / platform.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
index 9526fe9..7fe86a1 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/common/platform.c
@@ -190,7 +190,7 @@ struct amba_pl010_data adm5120_uart0_data = {
 
 struct amba_device adm5120_uart0_device = {
        .dev            = {
-               .bus_id = "APB:UART0",
+               .init_name = "apb:uart0",
                .platform_data = &adm5120_uart0_data,
        },
        .res            = {
@@ -208,7 +208,7 @@ struct amba_pl010_data adm5120_uart1_data = {
 
 struct amba_device adm5120_uart1_device = {
        .dev            = {
-               .bus_id = "APB:UART1",
+               .init_name = "apb:uart1",
                .platform_data = &adm5120_uart1_data,
        },
        .res            = {