Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 12253
b: refs/heads/master
c: 8b5f4f0
h: refs/heads/master
i:
  12251: 0bcf13e
v: v3
  • Loading branch information
Deepak Saxena authored and Russell King committed Nov 3, 2005
1 parent e1b015e commit a73e155
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f8b1178e246422ebddc1b16487314c91edf85fe
refs/heads/master: 8b5f4f06eecc081892b05cd6077314d68872dfd6
4 changes: 2 additions & 2 deletions trunk/arch/arm/configs/ixdp2401_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware"
CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware"
# CONFIG_XIP_KERNEL is not set

#
Expand Down Expand Up @@ -560,7 +560,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_8250_NR_UARTS=3
# CONFIG_SERIAL_8250_EXTENDED is not set

#
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/configs/ixdp2801_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=2
CONFIG_SERIAL_8250_NR_UARTS=3
# CONFIG_SERIAL_8250_EXTENDED is not set

#
Expand Down

0 comments on commit a73e155

Please sign in to comment.