diff options
-rw-r--r-- | arch/cris/Kconfig | 4 | ||||
-rw-r--r-- | arch/cris/arch-v10/Kconfig | 12 | ||||
-rw-r--r-- | drivers/net/irda/Kconfig | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 17addacb169e..408b055c585f 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
@@ -282,8 +282,8 @@ config ETRAX_RTC | |||
282 | Enables drivers for the Real-Time Clock battery-backed chips on | 282 | Enables drivers for the Real-Time Clock battery-backed chips on |
283 | some products. The kernel reads the time when booting, and | 283 | some products. The kernel reads the time when booting, and |
284 | the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a | 284 | the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a |
285 | rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc | 285 | rtc_time struct (see <file:arch/cris/include/asm/rtc.h>) on the |
286 | device. You can check the time with cat /proc/rtc, but | 286 | /dev/rtc device. You can check the time with cat /proc/rtc, but |
287 | normal time reading should be done using libc function time and | 287 | normal time reading should be done using libc function time and |
288 | friends. | 288 | friends. |
289 | 289 | ||
diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig index adc164e99339..df9a38b4f18f 100644 --- a/arch/cris/arch-v10/Kconfig +++ b/arch/cris/arch-v10/Kconfig | |||
@@ -24,8 +24,8 @@ config ETRAX_PA_LEDS | |||
24 | help | 24 | help |
25 | The ETRAX network driver is responsible for flashing LED's when | 25 | The ETRAX network driver is responsible for flashing LED's when |
26 | packets arrive and are sent. It uses macros defined in | 26 | packets arrive and are sent. It uses macros defined in |
27 | <file:include/asm-cris/io.h>, and those macros are defined after what | 27 | <file:arch/cris/include/asm/io.h>, and those macros are defined after |
28 | YOU choose in this option. The actual bits used are configured | 28 | what YOU choose in this option. The actual bits used are configured |
29 | separately. Select this if the LEDs are on port PA. Some products | 29 | separately. Select this if the LEDs are on port PA. Some products |
30 | put the leds on PB or a memory-mapped latch (CSP0) instead. | 30 | put the leds on PB or a memory-mapped latch (CSP0) instead. |
31 | 31 | ||
@@ -34,8 +34,8 @@ config ETRAX_PB_LEDS | |||
34 | help | 34 | help |
35 | The ETRAX network driver is responsible for flashing LED's when | 35 | The ETRAX network driver is responsible for flashing LED's when |
36 | packets arrive and are sent. It uses macros defined in | 36 | packets arrive and are sent. It uses macros defined in |
37 | <file:include/asm-cris/io.h>, and those macros are defined after what | 37 | <file:arch/cris/include/asm/io.h>, and those macros are defined after |
38 | YOU choose in this option. The actual bits used are configured | 38 | what YOU choose in this option. The actual bits used are configured |
39 | separately. Select this if the LEDs are on port PB. Some products | 39 | separately. Select this if the LEDs are on port PB. Some products |
40 | put the leds on PA or a memory-mapped latch (CSP0) instead. | 40 | put the leds on PA or a memory-mapped latch (CSP0) instead. |
41 | 41 | ||
@@ -44,8 +44,8 @@ config ETRAX_CSP0_LEDS | |||
44 | help | 44 | help |
45 | The ETRAX network driver is responsible for flashing LED's when | 45 | The ETRAX network driver is responsible for flashing LED's when |
46 | packets arrive and are sent. It uses macros defined in | 46 | packets arrive and are sent. It uses macros defined in |
47 | <file:include/asm-cris/io.h>, and those macros are defined after what | 47 | <file:arch/cris/include/asm/io.h>, and those macros are defined after |
48 | YOU choose in this option. The actual bits used are configured | 48 | what YOU choose in this option. The actual bits used are configured |
49 | separately. Select this if the LEDs are on a memory-mapped latch | 49 | separately. Select this if the LEDs are on a memory-mapped latch |
50 | using chip select CSP0, this is mapped at 0x90000000. | 50 | using chip select CSP0, this is mapped at 0x90000000. |
51 | Some products put the leds on PA or PB instead. | 51 | Some products put the leds on PA or PB instead. |
diff --git a/drivers/net/irda/Kconfig b/drivers/net/irda/Kconfig index 25bb2a015e18..a40fab44b9ae 100644 --- a/drivers/net/irda/Kconfig +++ b/drivers/net/irda/Kconfig | |||
@@ -183,7 +183,7 @@ config OLD_BELKIN_DONGLE | |||
183 | Say Y here if you want to build support for the Adaptec Airport 1000 | 183 | Say Y here if you want to build support for the Adaptec Airport 1000 |
184 | and 2000 dongles. If you want to compile it as a module, choose | 184 | and 2000 dongles. If you want to compile it as a module, choose |
185 | M here. Some information is contained in the comments | 185 | M here. Some information is contained in the comments |
186 | at the top of <file:drivers/net/irda/old_belkin.c>. | 186 | at the top of <file:drivers/net/irda/old_belkin-sir.c>. |
187 | 187 | ||
188 | config ACT200L_DONGLE | 188 | config ACT200L_DONGLE |
189 | tristate "ACTiSYS IR-200L dongle" | 189 | tristate "ACTiSYS IR-200L dongle" |