diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-02-28 15:36:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-28 15:36:58 -0800 |
| commit | 18963caaf55240d6a0491bdb27b7fef2882ffb15 (patch) | |
| tree | d0e4365cae0ce401ba826809f4eef0bd755f4f2d /arch/arm/mach-davinci/board-evm.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
| download | linux-dev-18963caaf55240d6a0491bdb27b7fef2882ffb15.tar.xz linux-dev-18963caaf55240d6a0491bdb27b7fef2882ffb15.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-davinci/board-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-evm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/board-evm.c b/arch/arm/mach-davinci/board-evm.c index a957d239a683..38b6a9ce2a93 100644 --- a/arch/arm/mach-davinci/board-evm.c +++ b/arch/arm/mach-davinci/board-evm.c @@ -311,6 +311,9 @@ evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c) gpio_request(gpio + 7, "nCF_SEL"); gpio_direction_output(gpio + 7, 1); + /* irlml6401 sustains over 3A, switches 5V in under 8 msec */ + setup_usb(500, 8); + return 0; } @@ -417,9 +420,6 @@ static __init void davinci_evm_init(void) platform_add_devices(davinci_evm_devices, ARRAY_SIZE(davinci_evm_devices)); evm_init_i2c(); - - /* irlml6401 sustains over 3A, switches 5V in under 8 msec */ - setup_usb(500, 8); } static __init void davinci_evm_irq_init(void) |