summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/pmac32_defconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-08-23 07:37:21 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2017-08-28 14:10:00 +0200
commit980b4503b9efd97bcb51d5508d82fbf3ccb6aadb (patch)
tree47cc9d7270281d4b8a499ff037cf6b21583f02d5 /arch/powerpc/configs/pmac32_defconfig
parentpowerpc/oops: Line up NIP & MSR with other rows (diff)
downloadlinux-980b4503b9efd97bcb51d5508d82fbf3ccb6aadb.tar.xz
linux-980b4503b9efd97bcb51d5508d82fbf3ccb6aadb.zip
powerpc/configs: Update for symbol movement only
Update defconfigs for symbols that have moved around, without their value changing. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/pmac32_defconfig')
-rw-r--r--arch/powerpc/configs/pmac32_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index fc1e7a7388b8..5acfb4fcc72b 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -21,6 +21,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_PMAC=y
CONFIG_PPC601_SYNC_FIX=y
+CONFIG_GEN_RTC=y
CONFIG_HIGHMEM=y
CONFIG_BINFMT_MISC=m
CONFIG_HIBERNATION=y
@@ -179,10 +180,10 @@ CONFIG_PPP_ASYNC=y
CONFIG_PPP_SYNC_TTY=m
CONFIG_USB_USBNET=m
# CONFIG_USB_NET_CDC_SUBSET is not set
-CONFIG_PRISM54=m
CONFIG_B43=m
CONFIG_B43LEGACY=m
CONFIG_P54_COMMON=m
+CONFIG_PRISM54=m
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_MOUSE_PS2 is not set
@@ -193,7 +194,6 @@ CONFIG_SERIAL_8250=m
CONFIG_SERIAL_PMACZILOG=m
CONFIG_SERIAL_PMACZILOG_TTYS=y
CONFIG_NVRAM=y
-CONFIG_GEN_RTC=y
CONFIG_I2C_CHARDEV=m
CONFIG_APM_POWER=y
CONFIG_BATTERY_PMU=y