diff options
| author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
|---|---|---|
| committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
| commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
| tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /firmware/SOURCES | |
| parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
| download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip | |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/SOURCES')
| -rw-r--r-- | firmware/SOURCES | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 3a606e5bfd..92e2c1d8c5 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
| @@ -588,6 +588,31 @@ target/arm/s3c2440/gigabeat-fx/pcm-meg-fx.c | |||
| 588 | #endif /* SIMULATOR */ | 588 | #endif /* SIMULATOR */ |
| 589 | #endif /* GIGABEAT_F */ | 589 | #endif /* GIGABEAT_F */ |
| 590 | 590 | ||
| 591 | #ifdef GIGABEAT_S | ||
| 592 | #ifndef SIMULATOR | ||
| 593 | target/arm/imx31/gigabeat-s/adc-imx31.c | ||
| 594 | target/arm/imx31/gigabeat-s/ata-imx31.c | ||
| 595 | target/arm/imx31/gigabeat-s/backlight-imx31.c | ||
| 596 | target/arm/imx31/gigabeat-s/button-imx31.c | ||
| 597 | target/arm/imx31/gigabeat-s/i2c-imx31.c | ||
| 598 | target/arm/imx31/gigabeat-s/i2s-imx31.c | ||
| 599 | target/arm/imx31/gigabeat-s/lcd-as-imx31.S | ||
| 600 | target/arm/imx31/gigabeat-s/lcd-imx31.c | ||
| 601 | target/arm/imx31/gigabeat-s/power-imx31.c | ||
| 602 | target/arm/imx31/gigabeat-s/powermgmt-imx31.c | ||
| 603 | target/arm/imx31/gigabeat-s/usb-imx31.c | ||
| 604 | target/arm/imx31/gigabeat-s/wmcodec-imx31.c | ||
| 605 | target/arm/imx31/gigabeat-s/dma_start.c | ||
| 606 | target/arm/imx31/gigabeat-s/system-imx31.c | ||
| 607 | target/arm/imx31/gigabeat-s/mmu-imx31.c | ||
| 608 | target/arm/imx31/gigabeat-s/avic-imx31.c | ||
| 609 | target/arm/imx31/gigabeat-s/spi-imx31.c | ||
| 610 | #ifndef BOOTLOADER | ||
| 611 | target/arm/imx31/gigabeat-fx/pcm-imx31.c | ||
| 612 | #endif | ||
| 613 | #endif /* SIMULATOR */ | ||
| 614 | #endif /* GIGABEAT_S */ | ||
| 615 | |||
| 591 | #ifdef MROBE_500 | 616 | #ifdef MROBE_500 |
| 592 | #ifndef SIMULATOR | 617 | #ifndef SIMULATOR |
| 593 | target/arm/olympus/mrobe-500/adc-mr500.c | 618 | target/arm/olympus/mrobe-500/adc-mr500.c |