summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/palmz72_defconfig
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-09-14 22:42:11 +0200
committerTony Lindgren <tony@atomide.com>2015-09-14 22:42:11 +0200
commit7168e947291f0ead07e5638b4599fb7845288b69 (patch)
treeb39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /arch/arm/configs/palmz72_defconfig
parentARM: omap2plus_defconfig: Enable MUSB DMA support (diff)
parentARM: dts: Fixup model name for HP t410 dts (diff)
downloadlinux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz
linux-7168e947291f0ead07e5638b4599fb7845288b69.zip
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'arch/arm/configs/palmz72_defconfig')
-rw-r--r--arch/arm/configs/palmz72_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig
index 4baa83c1c577..83c135e19aba 100644
--- a/arch/arm/configs/palmz72_defconfig
+++ b/arch/arm/configs/palmz72_defconfig
@@ -67,7 +67,7 @@ CONFIG_MMC=y
CONFIG_MMC_DEBUG=y
CONFIG_MMC_PXA=y
CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_SA1100=y
+CONFIG_RTC_DRV_PXA=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_DNOTIFY is not set