diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /lib/Kconfig | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 8cc8e8722a3f..c7ad7a5b3535 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -29,6 +29,13 @@ config CRC16 | |||
| 29 | the kernel tree does. Such modules that use library CRC16 | 29 | the kernel tree does. Such modules that use library CRC16 |
| 30 | functions require M here. | 30 | functions require M here. |
| 31 | 31 | ||
| 32 | config CRC_T10DIF | ||
| 33 | tristate "CRC calculation for the T10 Data Integrity Field" | ||
| 34 | help | ||
| 35 | This option is only needed if a module that's not in the | ||
| 36 | kernel tree needs to calculate CRC checks for use with the | ||
| 37 | SCSI data integrity subsystem. | ||
| 38 | |||
| 32 | config CRC_ITU_T | 39 | config CRC_ITU_T |
| 33 | tristate "CRC ITU-T V.41 functions" | 40 | tristate "CRC ITU-T V.41 functions" |
| 34 | help | 41 | help |