2.4.22

diff -urN linux-2.4.21/Makefile linux-2.4.22/Makefile
--- linux-2.4.21/Makefile   2003-06-13 07:51:39.000000000 -0700
+++ linux-2.4.22/Makefile   2003-08-25 04:44:44.000000000 -0700
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 4
-SUBLEVEL = 21
+SUBLEVEL = 22
 EXTRAVERSION =
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -40,10 +40,13 @@
 MODFLAGS   = -DMODULE
 CFLAGS_KERNEL   =
 PERL      = perl
+AWK      = awk
+RPM       := $(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \
+             else echo rpm; fi)
 
 export   VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
    CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
-   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL
+   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL AWK
 
 all:   do-it-all
 
@@ -125,14 +128,14 @@
 NETWORKS   =net/network.o
 
 LIBS      =$(TOPDIR)/lib/lib.a
-SUBDIRS      =kernel drivers mm fs net ipc lib
+SUBDIRS      =kernel drivers mm fs net ipc lib crypto
 
 DRIVERS-n :=
 DRIVERS-y :=
 DRIVERS-m :=
 DRIVERS-  :=
 
-DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
+DRIVERS-$(CONFIG_ACPI_BOOT) += drivers/acpi/acpi.o
 DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
 DRIVERS-y += drivers/char/char.o \
    drivers/block/block.o \
@@ -190,6 +193,7 @@
 DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
 DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
 DRIVERS-$(CONFIG_ISDN_BOOL) += drivers/isdn/vmlinux-obj.o
+DRIVERS-$(CONFIG_CRYPTO) += crypto/crypto.o
 
 DRIVERS := $(DRIVERS-y)
 
@@ -226,6 +230,7 @@
 # files removed with 'make mrproper'
 MRPROPER_FILES = \
    include/linux/autoconf.h include/linux/version.h \
+   lib/crc32table.h lib/gen_crc32table \
    drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
    drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
    drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
@@ -570,5 +575,5 @@
    rm $(KERNELPATH) ; \
    cd $(TOPDIR) ; \
    . scripts/mkversion > .version ; \
-   rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+   $(RPM) -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
    rm $(TOPDIR)/../$(KERNELPATH).tar.gz