diff options
| author | Wanlong Gao <wanlong.gao@gmail.com> | 2011-06-15 18:08:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-15 23:04:02 -0400 |
| commit | c7cbb02222eccb82bfd42696b01abceddae663f2 (patch) | |
| tree | 6204f5c691c762ccddaa10a3928316d7a803dc3b | |
| parent | fb139dfeef9558a12ffdbf9e26951fd1a9304f3b (diff) | |
rtc: fix build warnings in defconfigs
RTC_CLASS is changed to bool, so 'm' is invalid.
Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/netx_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/viper_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/xcep_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/zeus_defconfig | 2 | ||||
| -rw-r--r-- | arch/avr32/configs/atngw100_mrmt_defconfig | 2 | ||||
| -rw-r--r-- | arch/blackfin/configs/CM-BF548_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/mtx1_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/52xx/pcm030_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 2 | ||||
| -rw-r--r-- | arch/sh/configs/titan_defconfig | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 889922ad229c..67b5abb6f857 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
| @@ -157,7 +157,7 @@ CONFIG_LEDS_GPIO=m | |||
| 157 | CONFIG_LEDS_TRIGGERS=y | 157 | CONFIG_LEDS_TRIGGERS=y |
| 158 | CONFIG_LEDS_TRIGGER_TIMER=m | 158 | CONFIG_LEDS_TRIGGER_TIMER=m |
| 159 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m | 159 | CONFIG_LEDS_TRIGGER_HEARTBEAT=m |
| 160 | CONFIG_RTC_CLASS=m | 160 | CONFIG_RTC_CLASS=y |
| 161 | CONFIG_EXT2_FS=y | 161 | CONFIG_EXT2_FS=y |
| 162 | CONFIG_EXT3_FS=y | 162 | CONFIG_EXT3_FS=y |
| 163 | CONFIG_XFS_FS=m | 163 | CONFIG_XFS_FS=m |
diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig index 316af5479d90..9c0ad7993986 100644 --- a/arch/arm/configs/netx_defconfig +++ b/arch/arm/configs/netx_defconfig | |||
| @@ -60,7 +60,7 @@ CONFIG_FB_ARMCLCD=y | |||
| 60 | # CONFIG_VGA_CONSOLE is not set | 60 | # CONFIG_VGA_CONSOLE is not set |
| 61 | CONFIG_FRAMEBUFFER_CONSOLE=y | 61 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 62 | CONFIG_LOGO=y | 62 | CONFIG_LOGO=y |
| 63 | CONFIG_RTC_CLASS=m | 63 | CONFIG_RTC_CLASS=y |
| 64 | CONFIG_INOTIFY=y | 64 | CONFIG_INOTIFY=y |
| 65 | CONFIG_TMPFS=y | 65 | CONFIG_TMPFS=y |
| 66 | CONFIG_JFFS2_FS=y | 66 | CONFIG_JFFS2_FS=y |
diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 8b0c717378fa..1d01ddd33122 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig | |||
| @@ -142,7 +142,7 @@ CONFIG_USB_GADGETFS=m | |||
| 142 | CONFIG_USB_FILE_STORAGE=m | 142 | CONFIG_USB_FILE_STORAGE=m |
| 143 | CONFIG_USB_G_SERIAL=m | 143 | CONFIG_USB_G_SERIAL=m |
| 144 | CONFIG_USB_G_PRINTER=m | 144 | CONFIG_USB_G_PRINTER=m |
| 145 | CONFIG_RTC_CLASS=m | 145 | CONFIG_RTC_CLASS=y |
| 146 | CONFIG_RTC_DRV_DS1307=m | 146 | CONFIG_RTC_DRV_DS1307=m |
| 147 | CONFIG_RTC_DRV_SA1100=m | 147 | CONFIG_RTC_DRV_SA1100=m |
| 148 | CONFIG_EXT2_FS=m | 148 | CONFIG_EXT2_FS=m |
diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 5b5504143647..721832ffe2d7 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig | |||
| @@ -73,7 +73,7 @@ CONFIG_SENSORS_MAX6650=m | |||
| 73 | # CONFIG_VGA_CONSOLE is not set | 73 | # CONFIG_VGA_CONSOLE is not set |
| 74 | # CONFIG_HID_SUPPORT is not set | 74 | # CONFIG_HID_SUPPORT is not set |
| 75 | # CONFIG_USB_SUPPORT is not set | 75 | # CONFIG_USB_SUPPORT is not set |
| 76 | CONFIG_RTC_CLASS=m | 76 | CONFIG_RTC_CLASS=y |
| 77 | CONFIG_RTC_DRV_SA1100=m | 77 | CONFIG_RTC_DRV_SA1100=m |
| 78 | CONFIG_DMADEVICES=y | 78 | CONFIG_DMADEVICES=y |
| 79 | # CONFIG_DNOTIFY is not set | 79 | # CONFIG_DNOTIFY is not set |
diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 960f65514d88..59577ad3f4ef 100644 --- a/arch/arm/configs/zeus_defconfig +++ b/arch/arm/configs/zeus_defconfig | |||
| @@ -158,7 +158,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m | |||
| 158 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m | 158 | CONFIG_LEDS_TRIGGER_BACKLIGHT=m |
| 159 | CONFIG_LEDS_TRIGGER_GPIO=m | 159 | CONFIG_LEDS_TRIGGER_GPIO=m |
| 160 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m | 160 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=m |
| 161 | CONFIG_RTC_CLASS=m | 161 | CONFIG_RTC_CLASS=y |
| 162 | CONFIG_RTC_DRV_ISL1208=m | 162 | CONFIG_RTC_DRV_ISL1208=m |
| 163 | CONFIG_RTC_DRV_PXA=m | 163 | CONFIG_RTC_DRV_PXA=m |
| 164 | CONFIG_EXT2_FS=y | 164 | CONFIG_EXT2_FS=y |
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig index 6cb786c0baf6..77ca4f905d2c 100644 --- a/arch/avr32/configs/atngw100_mrmt_defconfig +++ b/arch/avr32/configs/atngw100_mrmt_defconfig | |||
| @@ -110,7 +110,7 @@ CONFIG_LEDS_GPIO=y | |||
| 110 | CONFIG_LEDS_TRIGGERS=y | 110 | CONFIG_LEDS_TRIGGERS=y |
| 111 | CONFIG_LEDS_TRIGGER_TIMER=y | 111 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 112 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 112 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 113 | CONFIG_RTC_CLASS=m | 113 | CONFIG_RTC_CLASS=y |
| 114 | CONFIG_RTC_DRV_S35390A=m | 114 | CONFIG_RTC_DRV_S35390A=m |
| 115 | CONFIG_RTC_DRV_AT32AP700X=m | 115 | CONFIG_RTC_DRV_AT32AP700X=m |
| 116 | CONFIG_DMADEVICES=y | 116 | CONFIG_DMADEVICES=y |
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig index 31d954216c05..9f1d08401fca 100644 --- a/arch/blackfin/configs/CM-BF548_defconfig +++ b/arch/blackfin/configs/CM-BF548_defconfig | |||
| @@ -112,7 +112,7 @@ CONFIG_USB_G_SERIAL=m | |||
| 112 | CONFIG_USB_G_PRINTER=m | 112 | CONFIG_USB_G_PRINTER=m |
| 113 | CONFIG_MMC=m | 113 | CONFIG_MMC=m |
| 114 | CONFIG_SDH_BFIN=m | 114 | CONFIG_SDH_BFIN=m |
| 115 | CONFIG_RTC_CLASS=m | 115 | CONFIG_RTC_CLASS=y |
| 116 | CONFIG_RTC_DRV_BFIN=m | 116 | CONFIG_RTC_DRV_BFIN=m |
| 117 | CONFIG_EXT2_FS=m | 117 | CONFIG_EXT2_FS=m |
| 118 | # CONFIG_DNOTIFY is not set | 118 | # CONFIG_DNOTIFY is not set |
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index 37862b2ce363..807c97eed8a8 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
| @@ -678,7 +678,7 @@ CONFIG_LEDS_TRIGGERS=y | |||
| 678 | CONFIG_LEDS_TRIGGER_TIMER=y | 678 | CONFIG_LEDS_TRIGGER_TIMER=y |
| 679 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 679 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
| 680 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | 680 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y |
| 681 | CONFIG_RTC_CLASS=m | 681 | CONFIG_RTC_CLASS=y |
| 682 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y | 682 | CONFIG_RTC_INTF_DEV_UIE_EMUL=y |
| 683 | CONFIG_RTC_DRV_TEST=m | 683 | CONFIG_RTC_DRV_TEST=m |
| 684 | CONFIG_RTC_DRV_DS1307=m | 684 | CONFIG_RTC_DRV_DS1307=m |
diff --git a/arch/powerpc/configs/52xx/pcm030_defconfig b/arch/powerpc/configs/52xx/pcm030_defconfig index 7f7e4a878602..22e719575c60 100644 --- a/arch/powerpc/configs/52xx/pcm030_defconfig +++ b/arch/powerpc/configs/52xx/pcm030_defconfig | |||
| @@ -85,7 +85,7 @@ CONFIG_USB_OHCI_HCD=m | |||
| 85 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y | 85 | CONFIG_USB_OHCI_HCD_PPC_OF_BE=y |
| 86 | # CONFIG_USB_OHCI_HCD_PCI is not set | 86 | # CONFIG_USB_OHCI_HCD_PCI is not set |
| 87 | CONFIG_USB_STORAGE=m | 87 | CONFIG_USB_STORAGE=m |
| 88 | CONFIG_RTC_CLASS=m | 88 | CONFIG_RTC_CLASS=y |
| 89 | CONFIG_RTC_DRV_PCF8563=m | 89 | CONFIG_RTC_DRV_PCF8563=m |
| 90 | CONFIG_EXT2_FS=m | 90 | CONFIG_EXT2_FS=m |
| 91 | CONFIG_EXT3_FS=m | 91 | CONFIG_EXT3_FS=m |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 6472322bf13b..185c292b0f1c 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -141,7 +141,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 142 | CONFIG_USB_OHCI_HCD=m | 142 | CONFIG_USB_OHCI_HCD=m |
| 143 | CONFIG_USB_STORAGE=m | 143 | CONFIG_USB_STORAGE=m |
| 144 | CONFIG_RTC_CLASS=m | 144 | CONFIG_RTC_CLASS=y |
| 145 | CONFIG_RTC_DRV_PS3=m | 145 | CONFIG_RTC_DRV_PS3=m |
| 146 | CONFIG_EXT2_FS=m | 146 | CONFIG_EXT2_FS=m |
| 147 | CONFIG_EXT3_FS=m | 147 | CONFIG_EXT3_FS=m |
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig index 0f558914e760..e2cbd92d520b 100644 --- a/arch/sh/configs/titan_defconfig +++ b/arch/sh/configs/titan_defconfig | |||
| @@ -227,7 +227,7 @@ CONFIG_USB_SERIAL=m | |||
| 227 | CONFIG_USB_SERIAL_GENERIC=y | 227 | CONFIG_USB_SERIAL_GENERIC=y |
| 228 | CONFIG_USB_SERIAL_ARK3116=m | 228 | CONFIG_USB_SERIAL_ARK3116=m |
| 229 | CONFIG_USB_SERIAL_PL2303=m | 229 | CONFIG_USB_SERIAL_PL2303=m |
| 230 | CONFIG_RTC_CLASS=m | 230 | CONFIG_RTC_CLASS=y |
| 231 | CONFIG_RTC_DRV_SH=m | 231 | CONFIG_RTC_DRV_SH=m |
| 232 | CONFIG_EXT2_FS=y | 232 | CONFIG_EXT2_FS=y |
| 233 | CONFIG_EXT3_FS=y | 233 | CONFIG_EXT3_FS=y |
