sync to kernel 2.6.32.12

[openwrt.git] / target / linux / xburst / n516 / config-2.6.32

diff --git a/target/linux/xburst/n516/config-2.6.32 b/target/linux/xburst/n516/config-2.6.32
index fa44bea..98c0801 100644 (file)
--- a/target/linux/xburst/n516/config-2.6.32
+++ b/target/linux/xburst/n516/config-2.6.32
@@ -2,7 +2,6 @@ CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_JZ4740=y
 CONFIG_FB_METRONOME=m
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_JZ4740=y
 CONFIG_FB_METRONOME=m
 CONFIG_FB_SYS_FOPS=m

-# CONFIG_FRAMEBUFFER_CONSOLE is not set

 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_I2C=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_I2C=y


@@ -10,16 +9,9 @@ CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_GPIO=y
 CONFIG_JZ4740_N516=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_GPIO=y
 CONFIG_JZ4740_N516=y

-# CONFIG_KEYBOARD_GPIO is not set

 CONFIG_LEDS_GPIO=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_N516_LPC=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_N516_LPC=y
 CONFIG_NEW_LEDS=y

-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_LP3971 is not set
-# CONFIG_REGULATOR_MAX1586 is not set
-# CONFIG_REGULATOR_TPS65023 is not set
-# CONFIG_REGULATOR_TPS6507X is not set

 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_LM75=y

-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_SOC_JZ4740=y