diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-02 15:22:01 -0500 |
commit | 3cac27c1d40b151f295dcfdb514fa928732e4ecf (patch) | |
tree | 5dbc1813bfa548e8d31879c39c075bfdcbbf8f86 /cpu/arm920t/at91rm9200/usb.c | |
parent | 3c89d75409eb26639d36dfa11d4ee3d8b962dc3c (diff) | |
parent | e60adeac2d8fa30258e1706bb342a3363526e8d7 (diff) | |
download | talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.tar.gz talos-obmc-uboot-3cac27c1d40b151f295dcfdb514fa928732e4ecf.zip |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'cpu/arm920t/at91rm9200/usb.c')
-rw-r--r-- | cpu/arm920t/at91rm9200/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/arm920t/at91rm9200/usb.c b/cpu/arm920t/at91rm9200/usb.c index 366262e4cc..c121de6328 100644 --- a/cpu/arm920t/at91rm9200/usb.c +++ b/cpu/arm920t/at91rm9200/usb.c @@ -28,7 +28,7 @@ #include <asm/arch/hardware.h> -int usb_cpu_init() +int usb_cpu_init(void) { /* Enable USB host clock. */ *AT91C_PMC_SCER = AT91C_PMC_UHP; /* 48MHz clock enabled for UHP */ @@ -36,7 +36,7 @@ int usb_cpu_init() return 0; } -int usb_cpu_stop() +int usb_cpu_stop(void) { /* Initialization failed */ *AT91C_PMC_PCDR = 1 << AT91C_ID_UHP; /* Peripheral Clock Disable Register */ @@ -44,9 +44,9 @@ int usb_cpu_stop() return 0; } -int usb_cpu_init_fail() +int usb_cpu_init_fail(void) { - usb_cpu_stop(); + return usb_cpu_stop(); } # endif /* CONFIG_AT91RM9200 */ |