diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-05 13:21:57 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-13 20:08:27 -0400 |
commit | c233d94931cebc8ec805fb98856f34ad16d49e4f (patch) | |
tree | 6bb0b7426616414128f85810a4a35369ce33bcfd /arch | |
parent | b5ead1cda64336b589eb4353e00f69c818fb6603 (diff) |
ARM: S3C: Move S3C64xx audio devices into S3C64xx directory
Allowing us to make the Kconfig a little bit saner.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-s3c/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/Makefile | 3 | ||||
-rw-r--r-- | arch/arm/plat-s3c64xx/dev-audio.c (renamed from arch/arm/plat-s3c/dev-audio.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/Makefile b/arch/arm/plat-s3c/Makefile index 3e27720ae35d..f32d045e7e36 100644 --- a/arch/arm/plat-s3c/Makefile +++ b/arch/arm/plat-s3c/Makefile | |||
@@ -38,7 +38,6 @@ obj-$(CONFIG_S3C_DEV_HSMMC) += dev-hsmmc.o | |||
38 | obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o | 38 | obj-$(CONFIG_S3C_DEV_HSMMC1) += dev-hsmmc1.o |
39 | obj-y += dev-i2c0.o | 39 | obj-y += dev-i2c0.o |
40 | obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o | 40 | obj-$(CONFIG_S3C_DEV_I2C1) += dev-i2c1.o |
41 | obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += dev-audio.o | ||
42 | obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o | 41 | obj-$(CONFIG_S3C_DEV_FB) += dev-fb.o |
43 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o | 42 | obj-$(CONFIG_S3C_DEV_USB_HOST) += dev-usb.o |
44 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o | 43 | obj-$(CONFIG_S3C_DEV_USB_HSOTG) += dev-usb-hsotg.o |
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index 3c8882cd6268..b85b4359e935 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile | |||
@@ -40,4 +40,5 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o | |||
40 | obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o | 40 | obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o |
41 | obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o | 41 | obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o |
42 | obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o | 42 | obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o |
43 | obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o \ No newline at end of file | 43 | obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
44 | obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o | ||
diff --git a/arch/arm/plat-s3c/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c index 1322beb40dd7..1322beb40dd7 100644 --- a/arch/arm/plat-s3c/dev-audio.c +++ b/arch/arm/plat-s3c64xx/dev-audio.c | |||