diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /arch/arm/mach-omap2/board-devkit8000.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 371019054b49..5bfc13b3176c 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -636,7 +636,7 @@ static struct omap_musb_board_data musb_board_data = { | |||
| 636 | .power = 100, | 636 | .power = 100, |
| 637 | }; | 637 | }; |
| 638 | 638 | ||
| 639 | static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 639 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { |
| 640 | 640 | ||
| 641 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, | 641 | .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, |
| 642 | .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, | 642 | .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, |