diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 3d5c870c1d7d499dae2ee66f0c2099b67f1889b0..f77209a8b61d32b3be22cec7b8d3df67b77dab4e 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 123461918c5b97d8f9e4b84da3af765b3c3eb456..8dd6b95d2b124206122d14affe06c8b4aa0537ab 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -7,3 +7,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index d8c01e6be3d2e7ff9285c0e21639c78fdfd2bd1c..0fd084b19745e97d741e9987f526630ab4cbe03e 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -11,3 +11,4 @@ CONFIG_SOUND=y
 CONFIG_CMD_SOUND=y
 CONFIG_I2S=y
 CONFIG_I2S_SAMSUNG=y
+CONFIG_SOUND_MAX98095=y
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 1b97af001bba66592dd4b4d0f146c78ba15c0c06..cfc75cb57e79017ac2c0d4ce0162165a4aefdae2 100644
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -28,3 +28,11 @@ config I2S_SAMSUNG
 	  using one of the available audio codec drivers. Enabling this
 	  option provides an implementation for sound_init() and
 	  sound_play().
+
+config SOUND_MAX98095
+	bool "Support Maxim max98095 audio codec"
+	depends on I2S_SAMSUNG
+	help
+	  Enable the max98095 audio codec. This is connected via I2S for
+	  audio data and I2C for codec control. At present it only works
+	  with the Samsung I2S driver.
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index 895d6e1994b3cb99d7d302e9b8e2165fb386ebec..79a7adf761cc5a714ec73bdeaad88f9325856746 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -30,7 +30,6 @@
 
 /* Sound */
 #ifdef CONFIG_CMD_SOUND
-#define CONFIG_SOUND_MAX98095
 #define CONFIG_SOUND_WM8994
 #endif