Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[cascardo/linux.git] / arch / unicore32 / Kconfig

diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 1e638e7..e5c5473 100644 (file)
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -15,15 +15,13 @@ config UNICORE32
        select GENERIC_IRQ_SHOW
        select ARCH_WANT_FRAME_POINTERS
        select GENERIC_IOMAP
+       select MODULES_USE_ELF_REL
        help
          UniCore-32 is 32-bit Instruction Set Architecture,
          including a series of low-power-consumption RISC chip
          designs licensed by PKUnity Ltd.
          Please see web page at <http://www.pkunity.com/>.
 
-config HAVE_PWM
-       bool
-
 config GENERIC_GPIO
        def_bool y
 
@@ -106,7 +104,8 @@ config PUV3_DB0913
 
 config PUV3_NB0916
        bool "NetBook board (0916)"
-       select HAVE_PWM
+       select PWM
+       select PWM_PUV3
 
 config PUV3_SMW0919
        bool "Security Mini-Workstation board (0919)"
@@ -220,12 +219,6 @@ config PUV3_GPIO
        select GPIO_SYSFS if EXPERIMENTAL
        default y
 
-config PUV3_PWM
-       tristate
-       default BACKLIGHT_PWM
-       help
-         Enable support for NB0916 PWM controllers
-
 if PUV3_NB0916
 
 menu "PKUnity NetBook-0916 Features"