Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137389
b: refs/heads/master
c: ace14b8
h: refs/heads/master
i:
  137387: 43821c4
v: v3
  • Loading branch information
Martin Michlmayr authored and Nicolas Pitre committed Mar 10, 2009
1 parent bb00187 commit c96c412
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 195f4a170eaeb8ef37c73e02adef2579168e9287
refs/heads/master: ace14b82633960a2b6bf6a0b2640c63872a65562
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-orion5x/dns323-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ static int __init dns323_dev_id(void)

static int __init dns323_pci_init(void)
{
/* The 5182 doesn't really use it's PCI bus, and initialising PCI
/* The 5182 doesn't really use its PCI bus, and initialising PCI
* gets in the way of initialising the SATA controller.
*/
if (machine_is_dns323() && dns323_dev_id() != MV88F5182_DEV_ID)
Expand Down Expand Up @@ -418,7 +418,7 @@ static void __init dns323_init(void)
orion5x_i2c_init();
orion5x_uart0_init();

/* The 5182 has it's SATA controller on-chip, and needs it's own little
/* The 5182 has its SATA controller on-chip, and needs its own little
* init routine.
*/
if (dns323_dev_id() == MV88F5182_DEV_ID)
Expand Down

0 comments on commit c96c412

Please sign in to comment.