From 1d44b6f3fcf6058fb7c960b7558766967e8028f7 Mon Sep 17 00:00:00 2001 From: Anton Arapov Date: Tue, 7 Aug 2012 11:21:50 +0200 Subject: fedora kernel: 222b075b3ff0d9e88aa9353e3c80667756ed7361 Signed-off-by: Anton Arapov --- arch/arm/mach-at91/board-usb-a926x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'arch/arm/mach-at91/board-usb-a926x.c') diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index b7483a3d098..95393fcaf19 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c @@ -53,12 +53,6 @@ static void __init ek_init_early(void) { /* Initialize processor: 12.00 MHz crystal */ at91_initialize(12000000); - - /* DBGU on ttyS0. (Rx & Tx only) */ - at91_register_uart(0, 0, 0); - - /* set serial console to ttyS0 (ie, DBGU) */ - at91_set_serial_console(0); } /* @@ -177,6 +171,10 @@ static struct mtd_partition __initdata ek_nand_partition[] = { .name = "bareboxenv2", .offset = MTDPART_OFS_NXTBLK, .size = SZ_128K, + }, { + .name = "oftree", + .offset = MTDPART_OFS_NXTBLK, + .size = SZ_128K, }, { .name = "kernel", .offset = MTDPART_OFS_NXTBLK, @@ -325,6 +323,8 @@ static void __init ek_add_device_leds(void) static void __init ek_board_init(void) { /* Serial */ + /* DBGU on ttyS0. (Rx & Tx only) */ + at91_register_uart(0, 0, 0); at91_add_device_serial(); /* USB Host */ at91_add_device_usbh(&ek_usbh_data); -- cgit