diff options
| author | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-11-08 13:56:38 -0500 |
| commit | 94851b18d4eb94f8bbf0d9176f7429bd8e371f62 (patch) | |
| tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /include/linux/mfd/ti_am335x_tscadc.h | |
| parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'include/linux/mfd/ti_am335x_tscadc.h')
| -rw-r--r-- | include/linux/mfd/ti_am335x_tscadc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h index db1791bb997a..25f2c611ab01 100644 --- a/include/linux/mfd/ti_am335x_tscadc.h +++ b/include/linux/mfd/ti_am335x_tscadc.h | |||
| @@ -121,7 +121,6 @@ | |||
| 121 | #define SEQ_STATUS BIT(5) | 121 | #define SEQ_STATUS BIT(5) |
| 122 | 122 | ||
| 123 | #define ADC_CLK 3000000 | 123 | #define ADC_CLK 3000000 |
| 124 | #define MAX_CLK_DIV 7 | ||
| 125 | #define TOTAL_STEPS 16 | 124 | #define TOTAL_STEPS 16 |
| 126 | #define TOTAL_CHANNELS 8 | 125 | #define TOTAL_CHANNELS 8 |
| 127 | 126 | ||