From 0b53ec3da90381816d1d87b211dade69c98c7dfd Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 15 Apr 2008 17:24:08 +0000 Subject: [PATCH] Move curses/speaker.c to drivers/ as it's not curses-specific (trivial). Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/curses/Makefile.inc | 1 - payloads/libpayload/drivers/Makefile.inc | 2 ++ payloads/libpayload/{curses => drivers}/speaker.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename payloads/libpayload/{curses => drivers}/speaker.c (99%) diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc index 745e38362b..7d5597ceeb 100644 --- a/payloads/libpayload/curses/Makefile.inc +++ b/payloads/libpayload/curses/Makefile.inc @@ -29,5 +29,4 @@ TARGETS-$(CONFIG_TINYCURSES) += curses/keyboard.o TARGETS-$(CONFIG_TINYCURSES) += curses/tinycurses.o -TARGETS-$(CONFIG_TINYCURSES) += curses/speaker.o TARGETS-$(CONFIG_TINYCURSES) += curses/colors.o diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc index ad6966c9dd..2b4fe0b67f 100644 --- a/payloads/libpayload/drivers/Makefile.inc +++ b/payloads/libpayload/drivers/Makefile.inc @@ -27,7 +27,9 @@ ## OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ## SUCH DAMAGE. ## + TARGETS-y += drivers/pci.o +TARGETS-y += drivers/speaker.o TARGETS-$(CONFIG_SERIAL_CONSOLE) += drivers/serial.o TARGETS-$(CONFIG_PC_KEYBOARD) += drivers/keyboard.o diff --git a/payloads/libpayload/curses/speaker.c b/payloads/libpayload/drivers/speaker.c similarity index 99% rename from payloads/libpayload/curses/speaker.c rename to payloads/libpayload/drivers/speaker.c index 53cfd586d1..3b3a750318 100644 --- a/payloads/libpayload/curses/speaker.c +++ b/payloads/libpayload/drivers/speaker.c @@ -34,7 +34,7 @@ * - Order number: 231244-006 */ -#include "local.h" +#include #define I82C54_CONTROL_WORD_REGISTER 0x43 /* Write-only. */