diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 00:00:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 00:00:19 -0400 |
commit | 45b583b10a8b438b970e95a7d1d4db22c9e35004 (patch) | |
tree | 14fa481598289df0459580c582b48a9d95db51f6 /drivers/misc/eeprom/Kconfig | |
parent | 154dd78d30b56ffb8b447f629bfcceb14150e5c4 (diff) | |
parent | f19da2ce8ef5e49b8b8ea199c3601dd45d71b262 (diff) |
Merge 'akpm' patch series
* Merge akpm patch series: (122 commits)
drivers/connector/cn_proc.c: remove unused local
Documentation/SubmitChecklist: add RCU debug config options
reiserfs: use hweight_long()
reiserfs: use proper little-endian bitops
pnpacpi: register disabled resources
drivers/rtc/rtc-tegra.c: properly initialize spinlock
drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
drivers/rtc: add support for Qualcomm PMIC8xxx RTC
drivers/rtc/rtc-s3c.c: support clock gating
drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
init: skip calibration delay if previously done
misc/eeprom: add eeprom access driver for digsy_mtc board
misc/eeprom: add driver for microwire 93xx46 EEPROMs
checkpatch.pl: update $logFunctions
checkpatch: make utf-8 test --strict
checkpatch.pl: add ability to ignore various messages
checkpatch: add a "prefer __aligned" check
checkpatch: validate signature styles and To: and Cc: lines
checkpatch: add __rcu as a sparse modifier
checkpatch: suggest using min_t or max_t
...
Did this as a merge because of (trivial) conflicts in
- Documentation/feature-removal-schedule.txt
- arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series.
Diffstat (limited to 'drivers/misc/eeprom/Kconfig')
-rw-r--r-- | drivers/misc/eeprom/Kconfig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig index 9118613af321..26cf12ca7f50 100644 --- a/drivers/misc/eeprom/Kconfig +++ b/drivers/misc/eeprom/Kconfig | |||
@@ -70,4 +70,29 @@ config EEPROM_93CX6 | |||
70 | 70 | ||
71 | If unsure, say N. | 71 | If unsure, say N. |
72 | 72 | ||
73 | config EEPROM_93XX46 | ||
74 | tristate "Microwire EEPROM 93XX46 support" | ||
75 | depends on SPI && SYSFS | ||
76 | help | ||
77 | Driver for the microwire EEPROM chipsets 93xx46x. The driver | ||
78 | supports both read and write commands and also the command to | ||
79 | erase the whole EEPROM. | ||
80 | |||
81 | This driver can also be built as a module. If so, the module | ||
82 | will be called eeprom_93xx46. | ||
83 | |||
84 | If unsure, say N. | ||
85 | |||
86 | config EEPROM_DIGSY_MTC_CFG | ||
87 | bool "DigsyMTC display configuration EEPROMs device" | ||
88 | depends on PPC_MPC5200_GPIO && GPIOLIB && SPI_GPIO | ||
89 | help | ||
90 | This option enables access to display configuration EEPROMs | ||
91 | on digsy_mtc board. You have to additionally select Microwire | ||
92 | EEPROM 93XX46 driver. sysfs entries will be created for that | ||
93 | EEPROM allowing to read/write the configuration data or to | ||
94 | erase the whole EEPROM. | ||
95 | |||
96 | If unsure, say N. | ||
97 | |||
73 | endmenu | 98 | endmenu |