diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/spi/spi-s3c24xx.c | 2 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/Kconfig | 4 | ||||
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 2 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 4af2a18eb3b..b3061684252 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
@@ -215,7 +215,7 @@ config TOUCHSCREEN_FUJITSU | |||
215 | 215 | ||
216 | config TOUCHSCREEN_S3C2410 | 216 | config TOUCHSCREEN_S3C2410 |
217 | tristate "Samsung S3C2410/generic touchscreen input driver" | 217 | tristate "Samsung S3C2410/generic touchscreen input driver" |
218 | depends on ARCH_S3C2410 || SAMSUNG_DEV_TS | 218 | depends on ARCH_S3C24XX || SAMSUNG_DEV_TS |
219 | select S3C_ADC | 219 | select S3C_ADC |
220 | help | 220 | help |
221 | Say Y here if you have the s3c2410 touchscreen. | 221 | Say Y here if you have the s3c2410 touchscreen. |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 9ca28fced2b..28b27ad57a1 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -69,7 +69,7 @@ config LEDS_MIKROTIK_RB532 | |||
69 | config LEDS_S3C24XX | 69 | config LEDS_S3C24XX |
70 | tristate "LED Support for Samsung S3C24XX GPIO LEDs" | 70 | tristate "LED Support for Samsung S3C24XX GPIO LEDs" |
71 | depends on LEDS_CLASS | 71 | depends on LEDS_CLASS |
72 | depends on ARCH_S3C2410 | 72 | depends on ARCH_S3C24XX |
73 | help | 73 | help |
74 | This option enables support for LEDs connected to GPIO lines | 74 | This option enables support for LEDs connected to GPIO lines |
75 | on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. | 75 | on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 00fcbed1afd..ecbee9bf87b 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -395,7 +395,7 @@ config MMC_SPI | |||
395 | 395 | ||
396 | config MMC_S3C | 396 | config MMC_S3C |
397 | tristate "Samsung S3C SD/MMC Card Interface support" | 397 | tristate "Samsung S3C SD/MMC Card Interface support" |
398 | depends on ARCH_S3C2410 | 398 | depends on ARCH_S3C24XX |
399 | help | 399 | help |
400 | This selects a driver for the MCI interface found in | 400 | This selects a driver for the MCI interface found in |
401 | Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs. | 401 | Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs. |
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 31b034b7eba..92e8559394d 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
@@ -187,7 +187,7 @@ config MTD_NAND_PPCHAMELEONEVB | |||
187 | 187 | ||
188 | config MTD_NAND_S3C2410 | 188 | config MTD_NAND_S3C2410 |
189 | tristate "NAND Flash support for Samsung S3C SoCs" | 189 | tristate "NAND Flash support for Samsung S3C SoCs" |
190 | depends on ARCH_S3C2410 || ARCH_S3C64XX | 190 | depends on ARCH_S3C24XX || ARCH_S3C64XX |
191 | help | 191 | help |
192 | This enables the NAND flash controller on the S3C24xx and S3C64xx | 192 | This enables the NAND flash controller on the S3C24xx and S3C64xx |
193 | SoCs | 193 | SoCs |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 3a125b83554..c2365d45508 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -748,7 +748,7 @@ config HAVE_S3C_RTC | |||
748 | 748 | ||
749 | config RTC_DRV_S3C | 749 | config RTC_DRV_S3C |
750 | tristate "Samsung S3C series SoC RTC" | 750 | tristate "Samsung S3C series SoC RTC" |
751 | depends on ARCH_S3C2410 || ARCH_S3C64XX || HAVE_S3C_RTC | 751 | depends on ARCH_S3C64XX || HAVE_S3C_RTC |
752 | help | 752 | help |
753 | RTC (Realtime Clock) driver for the clock inbuilt into the | 753 | RTC (Realtime Clock) driver for the clock inbuilt into the |
754 | Samsung S3C24XX series of SoCs. This can provide periodic | 754 | Samsung S3C24XX series of SoCs. This can provide periodic |
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 8293658e7cf..ac92194f894 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -281,7 +281,7 @@ config SPI_PXA2XX_PCI | |||
281 | 281 | ||
282 | config SPI_S3C24XX | 282 | config SPI_S3C24XX |
283 | tristate "Samsung S3C24XX series SPI" | 283 | tristate "Samsung S3C24XX series SPI" |
284 | depends on ARCH_S3C2410 && EXPERIMENTAL | 284 | depends on ARCH_S3C24XX && EXPERIMENTAL |
285 | select SPI_BITBANG | 285 | select SPI_BITBANG |
286 | help | 286 | help |
287 | SPI driver for Samsung S3C24XX series ARM SoCs | 287 | SPI driver for Samsung S3C24XX series ARM SoCs |
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c index fc064535f4f..8ee7d790ce4 100644 --- a/drivers/spi/spi-s3c24xx.c +++ b/drivers/spi/spi-s3c24xx.c | |||
@@ -24,10 +24,10 @@ | |||
24 | 24 | ||
25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
26 | #include <linux/spi/spi_bitbang.h> | 26 | #include <linux/spi/spi_bitbang.h> |
27 | #include <linux/spi/s3c24xx.h> | ||
27 | #include <linux/module.h> | 28 | #include <linux/module.h> |
28 | 29 | ||
29 | #include <plat/regs-spi.h> | 30 | #include <plat/regs-spi.h> |
30 | #include <mach/spi.h> | ||
31 | 31 | ||
32 | #include <plat/fiq.h> | 32 | #include <plat/fiq.h> |
33 | #include <asm/fiq.h> | 33 | #include <asm/fiq.h> |
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 75823a1abeb..5bf291353fe 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -37,7 +37,7 @@ config USB_ARCH_HAS_OHCI | |||
37 | # ARM: | 37 | # ARM: |
38 | default y if SA1111 | 38 | default y if SA1111 |
39 | default y if ARCH_OMAP | 39 | default y if ARCH_OMAP |
40 | default y if ARCH_S3C2410 | 40 | default y if ARCH_S3C24XX |
41 | default y if PXA27x | 41 | default y if PXA27x |
42 | default y if PXA3xx | 42 | default y if PXA3xx |
43 | default y if ARCH_EP93XX | 43 | default y if ARCH_EP93XX |
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 85ae4b46bb6..e695f1186fc 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -284,7 +284,7 @@ config USB_IMX | |||
284 | 284 | ||
285 | config USB_S3C2410 | 285 | config USB_S3C2410 |
286 | tristate "S3C2410 USB Device Controller" | 286 | tristate "S3C2410 USB Device Controller" |
287 | depends on ARCH_S3C2410 | 287 | depends on ARCH_S3C24XX |
288 | help | 288 | help |
289 | Samsung's S3C2410 is an ARM-4 processor with an integrated | 289 | Samsung's S3C2410 is an ARM-4 processor with an integrated |
290 | full speed USB 1.1 device controller. It has 4 configurable | 290 | full speed USB 1.1 device controller. It has 4 configurable |
@@ -299,7 +299,7 @@ config USB_S3C2410_DEBUG | |||
299 | 299 | ||
300 | config USB_S3C_HSUDC | 300 | config USB_S3C_HSUDC |
301 | tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller" | 301 | tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller" |
302 | depends on ARCH_S3C2410 | 302 | depends on ARCH_S3C24XX |
303 | select USB_GADGET_DUALSPEED | 303 | select USB_GADGET_DUALSPEED |
304 | help | 304 | help |
305 | Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC | 305 | Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC |
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 34b9edd8665..f15e08fca68 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -1000,7 +1000,7 @@ MODULE_LICENSE ("GPL"); | |||
1000 | #define SA1111_DRIVER ohci_hcd_sa1111_driver | 1000 | #define SA1111_DRIVER ohci_hcd_sa1111_driver |
1001 | #endif | 1001 | #endif |
1002 | 1002 | ||
1003 | #if defined(CONFIG_ARCH_S3C2410) || defined(CONFIG_ARCH_S3C64XX) | 1003 | #if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) |
1004 | #include "ohci-s3c2410.c" | 1004 | #include "ohci-s3c2410.c" |
1005 | #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver | 1005 | #define PLATFORM_DRIVER ohci_hcd_s3c2410_driver |
1006 | #endif | 1006 | #endif |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6ca0c407c14..64ad8cc886b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -2061,7 +2061,7 @@ config FB_S3C_DEBUG_REGWRITE | |||
2061 | 2061 | ||
2062 | config FB_S3C2410 | 2062 | config FB_S3C2410 |
2063 | tristate "S3C2410 LCD framebuffer support" | 2063 | tristate "S3C2410 LCD framebuffer support" |
2064 | depends on FB && ARCH_S3C2410 | 2064 | depends on FB && ARCH_S3C24XX |
2065 | select FB_CFB_FILLRECT | 2065 | select FB_CFB_FILLRECT |
2066 | select FB_CFB_COPYAREA | 2066 | select FB_CFB_COPYAREA |
2067 | select FB_CFB_IMAGEBLIT | 2067 | select FB_CFB_IMAGEBLIT |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 877b107f77a..3aa52ba1398 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -170,7 +170,7 @@ config HAVE_S3C2410_WATCHDOG | |||
170 | 170 | ||
171 | config S3C2410_WATCHDOG | 171 | config S3C2410_WATCHDOG |
172 | tristate "S3C2410 Watchdog" | 172 | tristate "S3C2410 Watchdog" |
173 | depends on ARCH_S3C2410 || HAVE_S3C2410_WATCHDOG | 173 | depends on HAVE_S3C2410_WATCHDOG |
174 | select WATCHDOG_CORE | 174 | select WATCHDOG_CORE |
175 | help | 175 | help |
176 | Watchdog timer block in the Samsung SoCs. This will reboot | 176 | Watchdog timer block in the Samsung SoCs. This will reboot |