diff --git a/[refs] b/[refs] index 6d45ec9ce277..0a86d81405c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c5d249ad3fb6ce3815c1ed5f04bece02a3e7030 +refs/heads/master: 5c617c6ff0379f9e55178165478e10761fa109e2 diff --git a/trunk/arch/cris/arch-v10/vmlinux.lds.S b/trunk/arch/cris/arch-v10/vmlinux.lds.S index 4b348b38cf33..9859d49d088b 100644 --- a/trunk/arch/cris/arch-v10/vmlinux.lds.S +++ b/trunk/arch/cris/arch-v10/vmlinux.lds.S @@ -44,7 +44,7 @@ SECTIONS ___data_start = . ; __Sdata = . ; .data : { /* Data */ - *(.data) + DATA_DATA } __edata = . ; /* End of data section */ _edata = . ; diff --git a/trunk/arch/cris/arch-v32/vmlinux.lds.S b/trunk/arch/cris/arch-v32/vmlinux.lds.S index dfa25e1542b9..e3a32ac17ab2 100644 --- a/trunk/arch/cris/arch-v32/vmlinux.lds.S +++ b/trunk/arch/cris/arch-v32/vmlinux.lds.S @@ -49,7 +49,7 @@ SECTIONS ___data_start = . ; __Sdata = . ; .data : { /* Data */ - *(.data) + DATA_DATA } __edata = . ; /* End of data section. */ _edata = . ;