diff options
author | Jassi Brar <jassi.brar@samsung.com> | 2010-01-28 03:14:49 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-02 20:55:01 -0500 |
commit | 4b4c662571bb3a19d6bacb4433886ec35c7093fa (patch) | |
tree | 73afcc041cbe96ce505e0a728a72b0e97e0eba5f | |
parent | 2848552cef6a14fe4e54e676a61a340c8fd023b3 (diff) |
ARM: S3C64XX: SPI: Make platform device compilation selectable
The SPI controller platform devices should be compiled in
independent of the driver support, otherwise we might end
up with dev-spi built as kernel module.
Change this to make every machine select if it has some SPI
device and wants to build device definitions.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/plat-s3c64xx/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/Makefile b/arch/arm/plat-s3c64xx/Makefile index 80255a5e1789..e60bde304d86 100644 --- a/arch/arm/plat-s3c64xx/Makefile +++ b/arch/arm/plat-s3c64xx/Makefile | |||
@@ -40,6 +40,9 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o | |||
40 | 40 | ||
41 | obj-$(CONFIG_S3C_ADC) += dev-adc.o | 41 | obj-$(CONFIG_S3C_ADC) += dev-adc.o |
42 | 42 | ||
43 | # SPI support | ||
44 | obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o | ||
45 | |||
43 | # Device setup | 46 | # Device setup |
44 | 47 | ||
45 | obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o | 48 | obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o |
@@ -47,4 +50,3 @@ obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o | |||
47 | obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o | 50 | obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o |
48 | obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 51 | obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
49 | obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o | 52 | obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o |
50 | obj-$(CONFIG_SPI_S3C64XX) += dev-spi.o | ||
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 1c2fe91c23e9..72da6461db12 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -132,6 +132,12 @@ config S3C_DEV_NAND | |||
132 | help | 132 | help |
133 | Compile in platform device definition for NAND controller | 133 | Compile in platform device definition for NAND controller |
134 | 134 | ||
135 | config S3C64XX_DEV_SPI | ||
136 | bool | ||
137 | help | ||
138 | Compile in platform device definitions for S3C64XX's type | ||
139 | SPI controllers. | ||
140 | |||
135 | comment "Power management" | 141 | comment "Power management" |
136 | 142 | ||
137 | config SAMSUNG_PM_DEBUG | 143 | config SAMSUNG_PM_DEBUG |