Skip to content

Commit

Permalink
omap3621_nookcolor_defconfig cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
TwidgeVR committed Jan 3, 2011
1 parent 35bf91e commit bde6bf6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
20 changes: 11 additions & 9 deletions arch/arm/configs/omap3621_nookcolor_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ CONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP=y
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_FREEZER=y

Expand Down Expand Up @@ -890,8 +890,8 @@ CONFIG_BATTERY_MAX17042=y
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_BQ27510 is not set
CONFIG_CHARGER_MAX8903=y
CONFIG_MAX9635=y
CONFIG_HWMON=y
# CONFIG_MAX9635 is not set
# CONFIG_HWMON is not set
# CONFIG_HWMON_VID is not set
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
Expand Down Expand Up @@ -1153,10 +1153,11 @@ CONFIG_FB_TILEBLITTING=y
CONFIG_OMAP2_DSS=y
CONFIG_OMAP2_DSS_VRAM_SIZE=8
CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
# CONFIG_OMAP2_DSS_RFBI is not set
CONFIG_OMAP2_DSS_RFBI=y
# CONFIG_OMAP2_DSS_VENC is not set
# CONFIG_OMAP2_DSS_SDI is not set
# CONFIG_OMAP2_DSS_DSI is not set
CONFIG_OMAP2_DSS_SDI=y
CONFIG_OMAP2_DSS_DSI=y
CONFIG_OMAP2_DSS_USE_DSI_PLL=y
# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=3

Expand All @@ -1174,7 +1175,7 @@ CONFIG_PANEL_BOXER_CPT=y
# CONFIG_SIL9022 is not set
CONFIG_FB_OMAP2=y
CONFIG_FB_OMAP2_DEBUG_SUPPORT=y
# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set
CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE=y
CONFIG_FB_OMAP2_NUM_FBS=3
CONFIG_FB_OMAP2_32_BPP=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
Expand Down Expand Up @@ -1244,7 +1245,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_TLV320AIC3111 is not set
CONFIG_SND_SOC_DAC3100=y
# CONFIG_SOUND_PRIME is not set
# CONFIG_HID_SUPPORT is not set
CONFIG_HID_SUPPORT=y
CONFIG_HID_COMPAT=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
Expand Down Expand Up @@ -1420,7 +1422,7 @@ CONFIG_RTC_DRV_TWL4030=y
#
# on-CPU RTC drivers
#
# CONFIG_DMADEVICES is not set
CONFIG_DMADEVICES=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_DEBUG=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/board-3621_evt1a.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ static struct regulator_consumer_supply boxer_vdds_dsi_supply = {
};

#ifdef CONFIG_FB_OMAP2
static struct resource boxer_vout_resource[2];
static struct resource boxer_vout_resource[2] = { };
//static struct resource boxer_vout_resource[3 - CONFIG_FB_OMAP2_NUM_FBS] = {
//};
#else
Expand Down

0 comments on commit bde6bf6

Please sign in to comment.