diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /arch/arm/mach-davinci/Kconfig | |
parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'arch/arm/mach-davinci/Kconfig')
-rw-r--r-- | arch/arm/mach-davinci/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 2ce1ef07c13d..ab99c3c3b752 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig | |||
@@ -62,7 +62,6 @@ config MACH_DAVINCI_EVM | |||
62 | bool "TI DM644x EVM" | 62 | bool "TI DM644x EVM" |
63 | default ARCH_DAVINCI_DM644x | 63 | default ARCH_DAVINCI_DM644x |
64 | depends on ARCH_DAVINCI_DM644x | 64 | depends on ARCH_DAVINCI_DM644x |
65 | select MISC_DEVICES | ||
66 | select EEPROM_AT24 | 65 | select EEPROM_AT24 |
67 | select I2C | 66 | select I2C |
68 | help | 67 | help |
@@ -72,7 +71,6 @@ config MACH_DAVINCI_EVM | |||
72 | config MACH_SFFSDR | 71 | config MACH_SFFSDR |
73 | bool "Lyrtech SFFSDR" | 72 | bool "Lyrtech SFFSDR" |
74 | depends on ARCH_DAVINCI_DM644x | 73 | depends on ARCH_DAVINCI_DM644x |
75 | select MISC_DEVICES | ||
76 | select EEPROM_AT24 | 74 | select EEPROM_AT24 |
77 | select I2C | 75 | select I2C |
78 | help | 76 | help |
@@ -106,7 +104,6 @@ config MACH_DAVINCI_DM6467_EVM | |||
106 | default ARCH_DAVINCI_DM646x | 104 | default ARCH_DAVINCI_DM646x |
107 | depends on ARCH_DAVINCI_DM646x | 105 | depends on ARCH_DAVINCI_DM646x |
108 | select MACH_DAVINCI_DM6467TEVM | 106 | select MACH_DAVINCI_DM6467TEVM |
109 | select MISC_DEVICES | ||
110 | select EEPROM_AT24 | 107 | select EEPROM_AT24 |
111 | select I2C | 108 | select I2C |
112 | help | 109 | help |
@@ -120,7 +117,6 @@ config MACH_DAVINCI_DM365_EVM | |||
120 | bool "TI DM365 EVM" | 117 | bool "TI DM365 EVM" |
121 | default ARCH_DAVINCI_DM365 | 118 | default ARCH_DAVINCI_DM365 |
122 | depends on ARCH_DAVINCI_DM365 | 119 | depends on ARCH_DAVINCI_DM365 |
123 | select MISC_DEVICES | ||
124 | select EEPROM_AT24 | 120 | select EEPROM_AT24 |
125 | select I2C | 121 | select I2C |
126 | help | 122 | help |
@@ -132,7 +128,6 @@ config MACH_DAVINCI_DA830_EVM | |||
132 | default ARCH_DAVINCI_DA830 | 128 | default ARCH_DAVINCI_DA830 |
133 | depends on ARCH_DAVINCI_DA830 | 129 | depends on ARCH_DAVINCI_DA830 |
134 | select GPIO_PCF857X | 130 | select GPIO_PCF857X |
135 | select MISC_DEVICES | ||
136 | select EEPROM_AT24 | 131 | select EEPROM_AT24 |
137 | select I2C | 132 | select I2C |
138 | help | 133 | help |
@@ -219,7 +214,6 @@ config MACH_TNETV107X | |||
219 | config MACH_MITYOMAPL138 | 214 | config MACH_MITYOMAPL138 |
220 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" | 215 | bool "Critical Link MityDSP-L138/MityARM-1808 SoM" |
221 | depends on ARCH_DAVINCI_DA850 | 216 | depends on ARCH_DAVINCI_DA850 |
222 | select MISC_DEVICES | ||
223 | select EEPROM_AT24 | 217 | select EEPROM_AT24 |
224 | select I2C | 218 | select I2C |
225 | help | 219 | help |