git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
cris
/
arch-v10
/
drivers
/
Kconfig
diff --git
a/arch/cris/arch-v10/drivers/Kconfig
b/arch/cris/arch-v10/drivers/Kconfig
index
8b50e84
..
e7e724b
100644
(file)
--- a/
arch/cris/arch-v10/drivers/Kconfig
+++ b/
arch/cris/arch-v10/drivers/Kconfig
@@
-550,7
+550,7
@@
config ETRAX_IDE
select BLK_DEV_IDEDMA
help
Enable this to get support for ATA/IDE.
select BLK_DEV_IDEDMA
help
Enable this to get support for ATA/IDE.
- You can't use paral
el
l ports or SCSI ports
+ You can't use paral
le
l ports or SCSI ports
at the same time.
at the same time.
@@
-744,7
+744,7
@@
config ETRAX_PA_CHANGEABLE_BITS
default "FF"
help
This is a bitmask with information of what bits in PA that a user
default "FF"
help
This is a bitmask with information of what bits in PA that a user
- can change
change
the value on using ioctl's.
+ can change the value on using ioctl's.
Bit set = changeable.
You probably want 00 here.
Bit set = changeable.
You probably want 00 here.
@@
-839,7
+839,7
@@
config ETRAX_DS1302_TRICKLE_CHARGE
default "0"
help
This controls the initial value of the trickle charge register.
default "0"
help
This controls the initial value of the trickle charge register.
- 0 = disabled (use this if you are unsure or have a non rechargable battery)
+ 0 = disabled (use this if you are unsure or have a non recharg
e
able battery)
Otherwise the following values can be OR:ed together to control the
charge current:
1 = 2kohm, 2 = 4kohm, 3 = 4kohm
Otherwise the following values can be OR:ed together to control the
charge current:
1 = 2kohm, 2 = 4kohm, 3 = 4kohm