diff --git a/[refs] b/[refs] index 182239294334..1d1c78435fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d93f5eefd456bde3dd14eac7b909f3ba4e55cdbb +refs/heads/master: 43c46216660a0329af558d2e6bdf540ee4d5c0d5 diff --git a/trunk/arch/arm/mach-s5p64x0/cpu.c b/trunk/arch/arm/mach-s5p64x0/cpu.c index a5c00952ea35..617da3b3bfb7 100644 --- a/trunk/arch/arm/mach-s5p64x0/cpu.c +++ b/trunk/arch/arm/mach-s5p64x0/cpu.c @@ -38,6 +38,7 @@ #include #include #include +#include /* Initial IO mappings */ @@ -108,6 +109,7 @@ void __init s5p6440_map_io(void) { /* initialize any device information early */ s3c_adc_setname("s3c64xx-adc"); + s3c_fb_setname("s5p64x0-fb"); iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc)); @@ -117,6 +119,7 @@ void __init s5p6450_map_io(void) { /* initialize any device information early */ s3c_adc_setname("s3c64xx-adc"); + s3c_fb_setname("s5p64x0-fb"); iotable_init(s5p64x0_iodesc, ARRAY_SIZE(s5p64x0_iodesc)); iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));