diff options
| author | Marcin Bukat <marcin.bukat@gmail.com> | 2018-06-12 12:50:09 +0200 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2018-06-12 12:50:09 +0200 |
| commit | 307ea8382e756bc6265e9edece074ff08c54267e (patch) | |
| tree | ee39311ff5376c9b4800636e75efe3f5adfe7678 | |
| parent | 71dc1a789ada01581e6a1be0f70c208e1eb2cddb (diff) | |
| download | rockbox-307ea8382e756bc6265e9edece074ff08c54267e.tar.gz rockbox-307ea8382e756bc6265e9edece074ff08c54267e.zip | |
Fix merge errors which broke sony linux targets
Change-Id: Ic0c618c6e2034609d1964bb3e9ff96c7a7cf1d40
| -rw-r--r-- | firmware/SOURCES | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index c7db8fc752..6fb744f524 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
| @@ -96,6 +96,10 @@ target/hosted/samsungypr/radio-ypr.c | |||
| 96 | #endif | 96 | #endif |
| 97 | 97 | ||
| 98 | #if defined(SONY_NWZ_LINUX) && !defined(SIMULATOR) | 98 | #if defined(SONY_NWZ_LINUX) && !defined(SIMULATOR) |
| 99 | target/hosted/backtrace-glibc.c | ||
| 100 | target/hosted/kernel-unix.c | ||
| 101 | target/hosted/filesystem-unix.c | ||
| 102 | target/hosted/lc-unix.c | ||
| 99 | target/hosted/sonynwz/lcd-nwz.c | 103 | target/hosted/sonynwz/lcd-nwz.c |
| 100 | target/hosted/sonynwz/button-nwz.c | 104 | target/hosted/sonynwz/button-nwz.c |
| 101 | target/hosted/sonynwz/system-nwz.c | 105 | target/hosted/sonynwz/system-nwz.c |