diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:52:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:52:35 -0500 |
| commit | 525995d77ca08dfc2ba6f8e606f93694271dbd66 (patch) | |
| tree | be9ddad66cd1301eea8dab7814cbda144a909e35 /drivers/char | |
| parent | e4bdda1bc3123a9e65f4dd93a23041fde8ed3dc2 (diff) | |
| parent | 64a2b168023bfd09037ba760838762e56c44178e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (88 commits)
Blackfin: Convert BUG() to use unreachable()
Blackfin: define __NR_recvmmsg
Blackfin: drop duplicate sched_clock
Blackfin: NOMPU: skip DMA ICPLB hole when it is redundant
Blackfin: MPU: add missing __init markings
Blackfin: add support for TIF_NOTIFY_RESUME
Blackfin: kgdb_test: clean up code a bit
Blackfin: convert kgdbtest to proc_fops
Blackfin: convert cyc2ns() to clocksource_cyc2ns()
Blackfin: ip0x: pull in asm/portmux.h for P_xxx defines
Blackfin: drop unused ax88180 resources
Blackfin: bf537-stamp: add ADF702x network driver resources
Blackfin: bf537-stamp: add CAN resources
Blackfin: bf537-stamp: add AD5258 i2c address
Blackfin: bf537-stamp: add adau1761 i2c address
Blackfin: bf537-stamp: add adau1371 i2c address
Blackfin: bf537-stamp: add ADP8870 resources
Blackfin: bf537-stamp: kill AD714x board-specific Kconfigs
Blackfin: bf537-stamp: update ADP5520 resources
Blackfin: bf537-stamp: add ADXL346 orientation sensing support
...
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 6f31c9472100..31be3ac2e21b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -502,7 +502,7 @@ config BRIQ_PANEL | |||
| 502 | 502 | ||
| 503 | config BFIN_OTP | 503 | config BFIN_OTP |
| 504 | tristate "Blackfin On-Chip OTP Memory Support" | 504 | tristate "Blackfin On-Chip OTP Memory Support" |
| 505 | depends on BLACKFIN && (BF52x || BF54x) | 505 | depends on BLACKFIN && (BF51x || BF52x || BF54x) |
| 506 | default y | 506 | default y |
| 507 | help | 507 | help |
| 508 | If you say Y here, you will get support for a character device | 508 | If you say Y here, you will get support for a character device |