 +	  Supports the 11G and 22E PHYs.
 +
  config FIXED_PHY
- 	bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- 	depends on PHYLIB=y
+ 	tristate "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
+ 	depends on PHYLIB
 diff -rupN old/linux-xlnx-xilinx-v2015.2/drivers/net/phy/Makefile linux-xlnx-xilinx-v2015.2/drivers/net/phy/Makefile
 --- old/linux-xlnx-xilinx-v2015.2/drivers/net/phy/Makefile
 +++ linux-xlnx-xilinx-v2015.2/drivers/net/phy/Makefile

diff -rupN old/linux-xlnx-xilinx-v2015.2/arch/arm/configs/xilinx_zynq_defconfig linux-xlnx-xilinx-v2015.2/arch/arm/configs/xilinx_zynq_defconfig
--- old/linux-xlnx-xilinx-v2015.2/arch/arm/configs/xilinx_zynq_defconfig
+++ linux-xlnx-xilinx-v2015.2/arch/arm/configs/xilinx_zynq_defconfig
@@ -117,6 +117,7 @@ CONFIG_XILINX_AXI_EMAC=y
 CONFIG_XILINX_PS_EMAC=y
 CONFIG_MARVELL_PHY=y
 CONFIG_VITESSE_PHY=y

diff -rupN old/linux-xlnx-xilinx-v2015.2/drivers/misc/eeprom/at24.c linux-xlnx-xilinx-v2015.2/drivers/misc/eeprom/at24.c
--- old/linux-xlnx-xilinx-v2015.2/drivers/misc/eeprom/at24.c
+++ linux-xlnx-xilinx-v2015.2/drivers/misc/eeprom/at24.c
@@ -519,6 +519,9 @@ static int at24_probe(struct i2c_client
 		 * is recommended anyhow.
 		 */
 		chip.page_size = 1;
