diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-04 17:50:34 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-04 17:50:34 -0500 |
commit | 9eed48c8bec98425dbd995dd72c40e9ad7a8c26b (patch) | |
tree | 187374b183ff589b43b7f8706829500ad2664dc2 /arch/sparc/lib/bootm.c | |
parent | a85670e40da1ef4f299effb73c36e48d39d50106 (diff) | |
parent | 7a4fb11b85939b47738283c3a7ae7f461468e274 (diff) | |
download | blackbird-obmc-uboot-9eed48c8bec98425dbd995dd72c40e9ad7a8c26b.tar.gz blackbird-obmc-uboot-9eed48c8bec98425dbd995dd72c40e9ad7a8c26b.zip |
Merge branch 'master' of http://git.denx.de/u-boot-sparc
Diffstat (limited to 'arch/sparc/lib/bootm.c')
-rw-r--r-- | arch/sparc/lib/bootm.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/sparc/lib/bootm.c b/arch/sparc/lib/bootm.c index 9e2b78464d..927a351013 100644 --- a/arch/sparc/lib/bootm.c +++ b/arch/sparc/lib/bootm.c @@ -19,10 +19,6 @@ extern image_header_t header; extern void srmmu_init_cpu(unsigned int entry); extern void prepare_bootargs(char *bootargs); -#ifdef CONFIG_USB_UHCI -extern int usb_lowlevel_stop(int index); -#endif - /* sparc kernel argument (the ROM vector) */ struct linux_romvec *kernel_arg_promvec; @@ -111,10 +107,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t * im linux_hdr->linuxver_minor, linux_hdr->linuxver_revision); #endif -#ifdef CONFIG_USB_UHCI - usb_lowlevel_stop(); -#endif - /* set basic boot params in kernel header now that it has been * extracted and is writeable. */ |