diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2008-04-15 17:24:08 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2008-04-15 17:24:08 +0000 |
| commit | 0b53ec3da90381816d1d87b211dade69c98c7dfd (patch) | |
| tree | dab20c0095b67536bf8b5bbf17aa614b9563c31a /payloads/libpayload | |
| parent | 53693031c54f95fdc60fce6a67fd3405dec72d1b (diff) | |
Move curses/speaker.c to drivers/ as it's not curses-specific (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/libpayload')
| -rw-r--r-- | payloads/libpayload/curses/Makefile.inc | 1 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/libpayload/drivers/speaker.c (renamed from payloads/libpayload/curses/speaker.c) | 2 |
3 files changed, 3 insertions, 2 deletions
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 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 <libpayload.h> #define I82C54_CONTROL_WORD_REGISTER 0x43 /* Write-only. */ |