diff options
Diffstat (limited to 'arch/avr32/configs')
-rw-r--r-- | arch/avr32/configs/atngw100_mrmt_defconfig | 5 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1002_defconfig | 5 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1003_defconfig | 5 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1004_defconfig | 5 | ||||
-rw-r--r-- | arch/avr32/configs/atstk1006_defconfig | 5 | ||||
-rw-r--r-- | arch/avr32/configs/favr-32_defconfig | 6 | ||||
-rw-r--r-- | arch/avr32/configs/merisc_defconfig | 5 |
7 files changed, 21 insertions, 15 deletions
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig index 9a57da44eb6f..6838781e966f 100644 --- a/arch/avr32/configs/atngw100_mrmt_defconfig +++ b/arch/avr32/configs/atngw100_mrmt_defconfig | |||
@@ -56,7 +56,6 @@ CONFIG_MTD_CFI_AMDSTD=y | |||
56 | CONFIG_MTD_PHYSMAP=y | 56 | CONFIG_MTD_PHYSMAP=y |
57 | CONFIG_MTD_DATAFLASH=y | 57 | CONFIG_MTD_DATAFLASH=y |
58 | CONFIG_BLK_DEV_LOOP=y | 58 | CONFIG_BLK_DEV_LOOP=y |
59 | CONFIG_ATMEL_PWM=y | ||
60 | CONFIG_NETDEVICES=y | 59 | CONFIG_NETDEVICES=y |
61 | CONFIG_NET_ETHERNET=y | 60 | CONFIG_NET_ETHERNET=y |
62 | CONFIG_MACB=y | 61 | CONFIG_MACB=y |
@@ -104,8 +103,8 @@ CONFIG_MMC=y | |||
104 | CONFIG_MMC_ATMELMCI=y | 103 | CONFIG_MMC_ATMELMCI=y |
105 | CONFIG_NEW_LEDS=y | 104 | CONFIG_NEW_LEDS=y |
106 | CONFIG_LEDS_CLASS=y | 105 | CONFIG_LEDS_CLASS=y |
107 | CONFIG_LEDS_ATMEL_PWM=y | ||
108 | CONFIG_LEDS_GPIO=y | 106 | CONFIG_LEDS_GPIO=y |
107 | CONFIG_LEDS_PWM=y | ||
109 | CONFIG_LEDS_TRIGGERS=y | 108 | CONFIG_LEDS_TRIGGERS=y |
110 | CONFIG_LEDS_TRIGGER_TIMER=y | 109 | CONFIG_LEDS_TRIGGER_TIMER=y |
111 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 110 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
@@ -114,6 +113,8 @@ CONFIG_RTC_DRV_S35390A=m | |||
114 | CONFIG_RTC_DRV_AT32AP700X=m | 113 | CONFIG_RTC_DRV_AT32AP700X=m |
115 | CONFIG_DMADEVICES=y | 114 | CONFIG_DMADEVICES=y |
116 | CONFIG_UIO=y | 115 | CONFIG_UIO=y |
116 | CONFIG_PWM=y | ||
117 | CONFIG_PWM_ATMEL=y | ||
117 | CONFIG_EXT2_FS=y | 118 | CONFIG_EXT2_FS=y |
118 | CONFIG_EXT2_FS_XATTR=y | 119 | CONFIG_EXT2_FS_XATTR=y |
119 | CONFIG_EXT3_FS=y | 120 | CONFIG_EXT3_FS=y |
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig index 2813dd2b9138..b056820eef33 100644 --- a/arch/avr32/configs/atstk1002_defconfig +++ b/arch/avr32/configs/atstk1002_defconfig | |||
@@ -64,7 +64,6 @@ CONFIG_BLK_DEV_LOOP=m | |||
64 | CONFIG_BLK_DEV_NBD=m | 64 | CONFIG_BLK_DEV_NBD=m |
65 | CONFIG_BLK_DEV_RAM=m | 65 | CONFIG_BLK_DEV_RAM=m |
66 | CONFIG_MISC_DEVICES=y | 66 | CONFIG_MISC_DEVICES=y |
67 | CONFIG_ATMEL_PWM=m | ||
68 | CONFIG_ATMEL_TCLIB=y | 67 | CONFIG_ATMEL_TCLIB=y |
69 | CONFIG_ATMEL_SSC=m | 68 | CONFIG_ATMEL_SSC=m |
70 | # CONFIG_SCSI_PROC_FS is not set | 69 | # CONFIG_SCSI_PROC_FS is not set |
@@ -133,14 +132,16 @@ CONFIG_MMC_TEST=m | |||
133 | CONFIG_MMC_ATMELMCI=y | 132 | CONFIG_MMC_ATMELMCI=y |
134 | CONFIG_NEW_LEDS=y | 133 | CONFIG_NEW_LEDS=y |
135 | CONFIG_LEDS_CLASS=y | 134 | CONFIG_LEDS_CLASS=y |
136 | CONFIG_LEDS_ATMEL_PWM=m | ||
137 | CONFIG_LEDS_GPIO=m | 135 | CONFIG_LEDS_GPIO=m |
136 | CONFIG_LEDS_PWM=m | ||
138 | CONFIG_LEDS_TRIGGERS=y | 137 | CONFIG_LEDS_TRIGGERS=y |
139 | CONFIG_LEDS_TRIGGER_TIMER=m | 138 | CONFIG_LEDS_TRIGGER_TIMER=m |
140 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 139 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
141 | CONFIG_RTC_CLASS=y | 140 | CONFIG_RTC_CLASS=y |
142 | CONFIG_RTC_DRV_AT32AP700X=y | 141 | CONFIG_RTC_DRV_AT32AP700X=y |
143 | CONFIG_DMADEVICES=y | 142 | CONFIG_DMADEVICES=y |
143 | CONFIG_PWM=y | ||
144 | CONFIG_PWM_ATMEL=m | ||
144 | CONFIG_EXT2_FS=y | 145 | CONFIG_EXT2_FS=y |
145 | CONFIG_EXT3_FS=y | 146 | CONFIG_EXT3_FS=y |
146 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 147 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig index f8ff3a3baad4..0cd23a303da1 100644 --- a/arch/avr32/configs/atstk1003_defconfig +++ b/arch/avr32/configs/atstk1003_defconfig | |||
@@ -53,7 +53,6 @@ CONFIG_BLK_DEV_LOOP=m | |||
53 | CONFIG_BLK_DEV_NBD=m | 53 | CONFIG_BLK_DEV_NBD=m |
54 | CONFIG_BLK_DEV_RAM=m | 54 | CONFIG_BLK_DEV_RAM=m |
55 | CONFIG_MISC_DEVICES=y | 55 | CONFIG_MISC_DEVICES=y |
56 | CONFIG_ATMEL_PWM=m | ||
57 | CONFIG_ATMEL_TCLIB=y | 56 | CONFIG_ATMEL_TCLIB=y |
58 | CONFIG_ATMEL_SSC=m | 57 | CONFIG_ATMEL_SSC=m |
59 | # CONFIG_SCSI_PROC_FS is not set | 58 | # CONFIG_SCSI_PROC_FS is not set |
@@ -112,14 +111,16 @@ CONFIG_MMC_TEST=m | |||
112 | CONFIG_MMC_ATMELMCI=y | 111 | CONFIG_MMC_ATMELMCI=y |
113 | CONFIG_NEW_LEDS=y | 112 | CONFIG_NEW_LEDS=y |
114 | CONFIG_LEDS_CLASS=y | 113 | CONFIG_LEDS_CLASS=y |
115 | CONFIG_LEDS_ATMEL_PWM=m | ||
116 | CONFIG_LEDS_GPIO=m | 114 | CONFIG_LEDS_GPIO=m |
115 | CONFIG_LEDS_PWM=m | ||
117 | CONFIG_LEDS_TRIGGERS=y | 116 | CONFIG_LEDS_TRIGGERS=y |
118 | CONFIG_LEDS_TRIGGER_TIMER=m | 117 | CONFIG_LEDS_TRIGGER_TIMER=m |
119 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 118 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
120 | CONFIG_RTC_CLASS=y | 119 | CONFIG_RTC_CLASS=y |
121 | CONFIG_RTC_DRV_AT32AP700X=y | 120 | CONFIG_RTC_DRV_AT32AP700X=y |
122 | CONFIG_DMADEVICES=y | 121 | CONFIG_DMADEVICES=y |
122 | CONFIG_PWM=y | ||
123 | CONFIG_PWM_ATMEL=m | ||
123 | CONFIG_EXT2_FS=y | 124 | CONFIG_EXT2_FS=y |
124 | CONFIG_EXT3_FS=y | 125 | CONFIG_EXT3_FS=y |
125 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 126 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig index 992228e54e38..ac1041f5f85a 100644 --- a/arch/avr32/configs/atstk1004_defconfig +++ b/arch/avr32/configs/atstk1004_defconfig | |||
@@ -53,7 +53,6 @@ CONFIG_BLK_DEV_LOOP=m | |||
53 | CONFIG_BLK_DEV_NBD=m | 53 | CONFIG_BLK_DEV_NBD=m |
54 | CONFIG_BLK_DEV_RAM=m | 54 | CONFIG_BLK_DEV_RAM=m |
55 | CONFIG_MISC_DEVICES=y | 55 | CONFIG_MISC_DEVICES=y |
56 | CONFIG_ATMEL_PWM=m | ||
57 | CONFIG_ATMEL_TCLIB=y | 56 | CONFIG_ATMEL_TCLIB=y |
58 | CONFIG_ATMEL_SSC=m | 57 | CONFIG_ATMEL_SSC=m |
59 | # CONFIG_SCSI_PROC_FS is not set | 58 | # CONFIG_SCSI_PROC_FS is not set |
@@ -111,14 +110,16 @@ CONFIG_MMC_TEST=m | |||
111 | CONFIG_MMC_ATMELMCI=y | 110 | CONFIG_MMC_ATMELMCI=y |
112 | CONFIG_NEW_LEDS=y | 111 | CONFIG_NEW_LEDS=y |
113 | CONFIG_LEDS_CLASS=y | 112 | CONFIG_LEDS_CLASS=y |
114 | CONFIG_LEDS_ATMEL_PWM=m | ||
115 | CONFIG_LEDS_GPIO=m | 113 | CONFIG_LEDS_GPIO=m |
114 | CONFIG_LEDS_PWM=m | ||
116 | CONFIG_LEDS_TRIGGERS=y | 115 | CONFIG_LEDS_TRIGGERS=y |
117 | CONFIG_LEDS_TRIGGER_TIMER=m | 116 | CONFIG_LEDS_TRIGGER_TIMER=m |
118 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 117 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
119 | CONFIG_RTC_CLASS=y | 118 | CONFIG_RTC_CLASS=y |
120 | CONFIG_RTC_DRV_AT32AP700X=y | 119 | CONFIG_RTC_DRV_AT32AP700X=y |
121 | CONFIG_DMADEVICES=y | 120 | CONFIG_DMADEVICES=y |
121 | CONFIG_PWM=y | ||
122 | CONFIG_PWM_ATMEL=m | ||
122 | CONFIG_EXT2_FS=y | 123 | CONFIG_EXT2_FS=y |
123 | CONFIG_EXT3_FS=y | 124 | CONFIG_EXT3_FS=y |
124 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 125 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig index b8e698b0d1fa..ea4f670cb995 100644 --- a/arch/avr32/configs/atstk1006_defconfig +++ b/arch/avr32/configs/atstk1006_defconfig | |||
@@ -67,7 +67,6 @@ CONFIG_BLK_DEV_LOOP=m | |||
67 | CONFIG_BLK_DEV_NBD=m | 67 | CONFIG_BLK_DEV_NBD=m |
68 | CONFIG_BLK_DEV_RAM=m | 68 | CONFIG_BLK_DEV_RAM=m |
69 | CONFIG_MISC_DEVICES=y | 69 | CONFIG_MISC_DEVICES=y |
70 | CONFIG_ATMEL_PWM=m | ||
71 | CONFIG_ATMEL_TCLIB=y | 70 | CONFIG_ATMEL_TCLIB=y |
72 | CONFIG_ATMEL_SSC=m | 71 | CONFIG_ATMEL_SSC=m |
73 | # CONFIG_SCSI_PROC_FS is not set | 72 | # CONFIG_SCSI_PROC_FS is not set |
@@ -136,14 +135,16 @@ CONFIG_MMC_TEST=m | |||
136 | CONFIG_MMC_ATMELMCI=y | 135 | CONFIG_MMC_ATMELMCI=y |
137 | CONFIG_NEW_LEDS=y | 136 | CONFIG_NEW_LEDS=y |
138 | CONFIG_LEDS_CLASS=y | 137 | CONFIG_LEDS_CLASS=y |
139 | CONFIG_LEDS_ATMEL_PWM=m | ||
140 | CONFIG_LEDS_GPIO=m | 138 | CONFIG_LEDS_GPIO=m |
139 | CONFIG_LEDS_PWM=m | ||
141 | CONFIG_LEDS_TRIGGERS=y | 140 | CONFIG_LEDS_TRIGGERS=y |
142 | CONFIG_LEDS_TRIGGER_TIMER=m | 141 | CONFIG_LEDS_TRIGGER_TIMER=m |
143 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 142 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
144 | CONFIG_RTC_CLASS=y | 143 | CONFIG_RTC_CLASS=y |
145 | CONFIG_RTC_DRV_AT32AP700X=y | 144 | CONFIG_RTC_DRV_AT32AP700X=y |
146 | CONFIG_DMADEVICES=y | 145 | CONFIG_DMADEVICES=y |
146 | CONFIG_PWM=y | ||
147 | CONFIG_PWM_ATMEL=m | ||
147 | CONFIG_EXT2_FS=y | 148 | CONFIG_EXT2_FS=y |
148 | CONFIG_EXT3_FS=y | 149 | CONFIG_EXT3_FS=y |
149 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | 150 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set |
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig index 07bed3f7eb5e..b3eb67dc05ac 100644 --- a/arch/avr32/configs/favr-32_defconfig +++ b/arch/avr32/configs/favr-32_defconfig | |||
@@ -67,7 +67,6 @@ CONFIG_MTD_PHYSMAP=y | |||
67 | CONFIG_BLK_DEV_LOOP=m | 67 | CONFIG_BLK_DEV_LOOP=m |
68 | CONFIG_BLK_DEV_NBD=m | 68 | CONFIG_BLK_DEV_NBD=m |
69 | CONFIG_BLK_DEV_RAM=m | 69 | CONFIG_BLK_DEV_RAM=m |
70 | CONFIG_ATMEL_PWM=m | ||
71 | CONFIG_ATMEL_TCLIB=y | 70 | CONFIG_ATMEL_TCLIB=y |
72 | CONFIG_ATMEL_SSC=m | 71 | CONFIG_ATMEL_SSC=m |
73 | CONFIG_NETDEVICES=y | 72 | CONFIG_NETDEVICES=y |
@@ -108,7 +107,7 @@ CONFIG_FB=y | |||
108 | CONFIG_FB_ATMEL=y | 107 | CONFIG_FB_ATMEL=y |
109 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 108 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
110 | # CONFIG_LCD_CLASS_DEVICE is not set | 109 | # CONFIG_LCD_CLASS_DEVICE is not set |
111 | CONFIG_BACKLIGHT_ATMEL_PWM=m | 110 | CONFIG_BACKLIGHT_PWM=m |
112 | CONFIG_SOUND=m | 111 | CONFIG_SOUND=m |
113 | CONFIG_SOUND_PRIME=m | 112 | CONFIG_SOUND_PRIME=m |
114 | # CONFIG_HID_SUPPORT is not set | 113 | # CONFIG_HID_SUPPORT is not set |
@@ -123,7 +122,6 @@ CONFIG_MMC=y | |||
123 | CONFIG_MMC_ATMELMCI=y | 122 | CONFIG_MMC_ATMELMCI=y |
124 | CONFIG_NEW_LEDS=y | 123 | CONFIG_NEW_LEDS=y |
125 | CONFIG_LEDS_CLASS=y | 124 | CONFIG_LEDS_CLASS=y |
126 | CONFIG_LEDS_ATMEL_PWM=m | ||
127 | CONFIG_LEDS_GPIO=y | 125 | CONFIG_LEDS_GPIO=y |
128 | CONFIG_LEDS_TRIGGERS=y | 126 | CONFIG_LEDS_TRIGGERS=y |
129 | CONFIG_LEDS_TRIGGER_TIMER=y | 127 | CONFIG_LEDS_TRIGGER_TIMER=y |
@@ -132,6 +130,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | |||
132 | CONFIG_RTC_CLASS=y | 130 | CONFIG_RTC_CLASS=y |
133 | CONFIG_RTC_DRV_AT32AP700X=y | 131 | CONFIG_RTC_DRV_AT32AP700X=y |
134 | CONFIG_DMADEVICES=y | 132 | CONFIG_DMADEVICES=y |
133 | CONFIG_PWM=y | ||
134 | CONFIG_PWM_ATMEL=y | ||
135 | CONFIG_EXT2_FS=y | 135 | CONFIG_EXT2_FS=y |
136 | CONFIG_EXT3_FS=y | 136 | CONFIG_EXT3_FS=y |
137 | # CONFIG_EXT3_FS_XATTR is not set | 137 | # CONFIG_EXT3_FS_XATTR is not set |
diff --git a/arch/avr32/configs/merisc_defconfig b/arch/avr32/configs/merisc_defconfig index 91df6b2986be..b9ef4cc85d08 100644 --- a/arch/avr32/configs/merisc_defconfig +++ b/arch/avr32/configs/merisc_defconfig | |||
@@ -55,7 +55,6 @@ CONFIG_MTD_ABSENT=y | |||
55 | CONFIG_MTD_PHYSMAP=y | 55 | CONFIG_MTD_PHYSMAP=y |
56 | CONFIG_MTD_BLOCK2MTD=y | 56 | CONFIG_MTD_BLOCK2MTD=y |
57 | CONFIG_BLK_DEV_LOOP=y | 57 | CONFIG_BLK_DEV_LOOP=y |
58 | CONFIG_ATMEL_PWM=y | ||
59 | CONFIG_ATMEL_SSC=y | 58 | CONFIG_ATMEL_SSC=y |
60 | CONFIG_SCSI=y | 59 | CONFIG_SCSI=y |
61 | CONFIG_BLK_DEV_SD=y | 60 | CONFIG_BLK_DEV_SD=y |
@@ -103,12 +102,14 @@ CONFIG_MMC=y | |||
103 | CONFIG_MMC_ATMELMCI=y | 102 | CONFIG_MMC_ATMELMCI=y |
104 | CONFIG_NEW_LEDS=y | 103 | CONFIG_NEW_LEDS=y |
105 | CONFIG_LEDS_CLASS=y | 104 | CONFIG_LEDS_CLASS=y |
106 | CONFIG_LEDS_ATMEL_PWM=y | 105 | CONFIG_LEDS_PWM=y |
107 | CONFIG_RTC_CLASS=y | 106 | CONFIG_RTC_CLASS=y |
108 | # CONFIG_RTC_HCTOSYS is not set | 107 | # CONFIG_RTC_HCTOSYS is not set |
109 | CONFIG_RTC_DRV_PCF8563=y | 108 | CONFIG_RTC_DRV_PCF8563=y |
110 | CONFIG_DMADEVICES=y | 109 | CONFIG_DMADEVICES=y |
111 | CONFIG_UIO=y | 110 | CONFIG_UIO=y |
111 | CONFIG_PWM=y | ||
112 | CONFIG_PWM_ATMEL=m | ||
112 | CONFIG_EXT2_FS=y | 113 | CONFIG_EXT2_FS=y |
113 | # CONFIG_DNOTIFY is not set | 114 | # CONFIG_DNOTIFY is not set |
114 | CONFIG_FUSE_FS=y | 115 | CONFIG_FUSE_FS=y |