libpayload: Move the USB functions in libpayload.h to usb/usb.h.
Since these are the last declarations in libpayload.h and it's no longer used
or included anywhere, it can finally be deleted.
Change-Id: Ia7add2c54dab12ec4b0cb16617240a67d9b49508
diff --git a/src/drivers/bus/usb/usb.c b/src/drivers/bus/usb/usb.c
index abc842b..82b2379 100644
--- a/src/drivers/bus/usb/usb.c
+++ b/src/drivers/bus/usb/usb.c
@@ -21,7 +21,7 @@
*/
#include <assert.h>
-#include <libpayload.h>
+#include <usb/usb.h>
#include "base/cleanup.h"
#include "base/xalloc.h"
diff --git a/src/libpayload/include/libpayload.h b/src/libpayload/include/libpayload.h
deleted file mode 100644
index 779ac63..0000000
--- a/src/libpayload/include/libpayload.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2008 Advanced Micro Devices, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _LIBPAYLOAD_H
-#define _LIBPAYLOAD_H
-
-#include <arch/types.h>
-
-int usb_initialize(void);
-int usb_exit(void);
-
-#endif
diff --git a/src/libpayload/include/usb/usb.h b/src/libpayload/include/usb/usb.h
index 89c0bb7..0589bc5 100644
--- a/src/libpayload/include/usb/usb.h
+++ b/src/libpayload/include/usb/usb.h
@@ -369,4 +369,7 @@
*/
void __attribute__((weak)) usb_generic_remove(UsbDev *dev);
+int usb_initialize(void);
+int usb_exit(void);
+
#endif
