Index: arch/ppc/platforms/xilinx_ocp/Makefile =================================================================== RCS file: /cvsroot/linuxppc_2_4_devel/arch/ppc/platforms/xilinx_ocp/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- arch/ppc/platforms/xilinx_ocp/Makefile 1 Dec 2002 22:42:56 -0000 1.1 +++ arch/ppc/platforms/xilinx_ocp/Makefile 13 Apr 2004 17:48:37 -0000 @@ -13,6 +13,7 @@ xipif_v1_23_b.o xpacket_fifo_v1_00_b.o xversion.o obj-$(CONFIG_XILINX_OCP) := xilinx_ocp.o +obj-$(CONFIG_JSE) := xilinx_ocp.o xilinx_ocp.o: $(xilinx_ocp-objs) $(LD) -r -o $@ $(xilinx_ocp-objs) Index: arch/ppc/platforms/xilinx_ocp/xparameters.h =================================================================== RCS file: /cvsroot/linuxppc_2_4_devel/arch/ppc/platforms/xilinx_ocp/xparameters.h,v retrieving revision 1.2 diff -u -r1.2 xparameters.h --- arch/ppc/platforms/xilinx_ocp/xparameters.h 30 Oct 2003 00:32:20 -0000 1.2 +++ arch/ppc/platforms/xilinx_ocp/xparameters.h 13 Apr 2004 17:48:37 -0000 @@ -16,3 +16,7 @@ #if defined(CONFIG_XILINX_ML300) #include "xparameters_ml300.h" #endif + +#if defined(CONFIG_JSE) +#include "xparameters_jse.h" +#endif Index: drivers/block/Config.in =================================================================== RCS file: /cvsroot/linuxppc_2_4_devel/drivers/block/Config.in,v retrieving revision 1.5 diff -u -r1.5 Config.in --- drivers/block/Config.in 30 Oct 2003 00:32:48 -0000 1.5 +++ drivers/block/Config.in 13 Apr 2004 17:48:37 -0000 @@ -40,7 +40,7 @@ dep_tristate 'Mylex DAC960/DAC1100 PCI RAID Controller support' CONFIG_BLK_DEV_DAC960 $CONFIG_PCI dep_tristate 'Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)' CONFIG_BLK_DEV_UMEM $CONFIG_PCI $CONFIG_EXPERIMENTAL -if [ "$CONFIG_XILINX_OCP" = "y" ]; then +if [ "$CONFIG_XILINX_OCP" = "y" -o "$CONFIG_JSE" = "y" ]; then tristate 'Xilinx on-chip System ACE' CONFIG_XILINX_SYSACE fi