1 Index: linux-2.4.24-2/arch/um/config.in
2 --- linux-2.4.24-2/arch/um/config.in 7 Apr 2004 20:44:02 -0000 1.56
3 +++ linux-2.4.24-2/arch/um/config.in 17 May 2004 18:35:49 -0000
7 mainmenu_option next_comment
8 +comment 'Loadable module support'
9 +bool 'Enable loadable module support' CONFIG_MODULES
10 +if [ "$CONFIG_MODULES" = "y" ]; then
11 +# MODVERSIONS does not yet work in this architecture
12 +# bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
13 + bool ' Kernel module loader' CONFIG_KMOD
17 +mainmenu_option next_comment
18 comment 'General Setup'
20 bool 'Separate kernel address space support' CONFIG_MODE_SKAS
22 bool 'Real-time Clock' CONFIG_UML_REAL_TIME_CLOCK
25 -mainmenu_option next_comment
26 -comment 'Loadable module support'
27 -bool 'Enable loadable module support' CONFIG_MODULES
28 -if [ "$CONFIG_MODULES" = "y" ]; then
29 -# MODVERSIONS does not yet work in this architecture
30 -# bool ' Set version information on all module symbols' CONFIG_MODVERSIONS
31 - bool ' Kernel module loader' CONFIG_KMOD
32 +if [ "$CONFIG_NET" = "y" ]; then
33 + source net/Config.in
37 source arch/um/config_char.in
39 source arch/um/config_block.in
41 -define_bool CONFIG_NETDEVICES $CONFIG_NET
43 -if [ "$CONFIG_NET" = "y" ]; then
44 - source arch/um/config_net.in
45 - source net/Config.in
47 +source drivers/mtd/Config.in
50 +source drivers/md/Config.in
52 mainmenu_option next_comment
53 comment 'SCSI support'
58 -source drivers/md/Config.in
59 +if [ "$CONFIG_NET" = "y" ]; then
60 + mainmenu_option next_comment
61 + comment 'Network Devices'
63 -source drivers/mtd/Config.in
64 + bool 'Network device support' CONFIG_NETDEVICES
65 + if [ "$CONFIG_NETDEVICES" = "y" ]; then
66 + source arch/um/config_net.in
75 mainmenu_option next_comment
76 comment 'Kernel hacking'
78 dep_bool 'Enable gprof support' CONFIG_GPROF $CONFIG_DEBUGSYM
79 dep_bool 'Enable gcov support' CONFIG_GCOV $CONFIG_DEBUGSYM
82 +source crypto/Config.in
84 Index: linux-2.4.24-2/arch/um/config_net.in
85 --- linux-2.4.24-2/arch/um/config_net.in 7 Apr 2004 20:42:33 -0000 1.4
86 +++ linux-2.4.24-2/arch/um/config_net.in 17 May 2004 18:35:49 -0000
88 -mainmenu_option next_comment
89 -comment 'Network Devices'
92 bool 'Virtual network device' CONFIG_UML_NET
95 dep_bool ' CSLIP compressed headers' CONFIG_SLIP_COMPRESSED $CONFIG_SLIP
96 dep_bool ' Keepalive and linefill' CONFIG_SLIP_SMART $CONFIG_SLIP
97 dep_bool ' Six bit SLIP encapsulation' CONFIG_SLIP_MODE_SLIP6 $CONFIG_SLIP
100 Index: linux-2.4.24-2/arch/um/drivers/Makefile
101 --- linux-2.4.24-2/arch/um/drivers/Makefile 16 Feb 2004 00:09:07 -0000 1.50
102 +++ linux-2.4.24-2/arch/um/drivers/Makefile 17 May 2004 18:35:49 -0000
106 obj-$(CONFIG_SSL) += ssl.o
107 +obj-$(CONFIG_STDIO_CONSOLE) += stdio_console.o
108 obj-$(CONFIG_UML_NET_SLIP) += slip.o
109 obj-$(CONFIG_UML_NET_SLIRP) += slirp.o
110 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o
113 CFLAGS_pcap_user.o = -I/usr/include/pcap
115 -obj-y += stdio_console.o $(CHAN_OBJS)
116 +obj-y += $(CHAN_OBJS)
118 USER_SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
121 $(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
124 + rm -f $(OBJS) $(export-objs)