git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[sfrench/cifs-2.6.git]
/
arch
/
avr32
/
configs
/
atstk1004_defconfig
diff --git
a/arch/avr32/configs/atstk1004_defconfig
b/arch/avr32/configs/atstk1004_defconfig
index 69e6c0d08ce8988d05dc32a728a7b939beddae1d..518f7898df75f69c5c9a8d3befc025a152cf3407 100644
(file)
--- a/
arch/avr32/configs/atstk1004_defconfig
+++ b/
arch/avr32/configs/atstk1004_defconfig
@@
-394,7
+394,7
@@
CONFIG_SPI_ATMEL=y
#
# SPI Protocol Masters
#
-# CONFIG_
SPI
_AT25 is not set
+# CONFIG_
EEPROM
_AT25 is not set
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
CONFIG_ARCH_REQUIRE_GPIOLIB=y