--- trunk/linux-libc-headers/headers.sh	2007/03/16 00:06:55	435
+++ trunk/linux-libc-headers/headers.sh	2007/12/18 00:23:39	642
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Minimal Sanitized Headers - Version 01.00
+# Minimal Sanitized Headers - Version 01.02
 #
 # Submit bugreports via http://headers.cross-lfs.org
 #
@@ -152,6 +152,8 @@
 				    -e '/#include <asm.hpet.h>/d' \
 				    -e '/#include <asm.ide.h>/d' \
 				    -e '/#include <asm.interrupt.h>/d' \
+				    -e '/#include <asm.machtypes.h>/d' \
+				    -e '/#include <asm.mach-types.h>/d' \
 				    -e '/#include <asm.machvec_init.h>/d' \
 				    -e '/#include <asm.mtd-xip.h>/d' \
 				    -e '/#include <asm.offset.h>/d' \
@@ -162,6 +164,8 @@
 				    -e '/#include <asm.proc-fns.h>/d' \
 				    -e '/#include <asm.rwclock.h>/d' \
 				    -e '/#include <asm.sections.h>/d' \
+				    -e '/#include <asm.serial-bigsur.h>/d' \
+				    -e '/#include <asm.serial-ec3104.h>/d' \
 				    -e '/#include <asm.spinlock_types.h>/d' \
 				    -e '/#include <asm.thread_info.h>/d' \
 				    -e '/#include <asm.uaccess.h>/d' \
@@ -221,9 +225,6 @@
 				    -e 's/|| defined (__KERNEL__)//g' \
 				    -e 's/#ifdef linux/#ifdef __linux__/g' \
 				    -e 's/#ifndef linux/#ifndef __linux__/g' \
-				    -e '/#include <asm.machtypes.h>/d' \
-				    -e '/#include <asm.serial-bigsur.h>/d' \
-				    -e '/#include <asm.serial-ec3104.h>/d' \
 				       $header > $header.new
 				mv $header.new $header
 
@@ -576,6 +577,8 @@
 
 GLIBC_HEADERS=$(cat $CURRENT_DIR/lists/glibc-headers)
 
+COPY_HEADERS=$(cat $CURRENT_DIR/lists/copy-headers)
+
 REMOVE_HEADERS=$(cat $CURRENT_DIR/lists/remove-headers)
 
 if [ "$FILE" = "yes" ]; then
@@ -725,7 +728,7 @@
 	fi
 done
 
-SETTYPE="mtd scsi sound"
+SETTYPE="acpi mtd scsi sound"
 for type in $SETTYPE; do
 	TYPE="$type"
 	cd $ORIGDIR
@@ -1313,6 +1316,14 @@
 cp $TYPES_H.new $TYPES_H
 clean_header $TYPES_H
 
+for files in $COPY_HEADERS; do
+	echo "$files" | {
+		IFS=':' read sfile dfile
+		echo "Copying $sfile to $dfile..."
+		cp $NEWDIR/$sfile $NEWDIR/$dfile
+	}
+done
+
 for file in $REMOVE_HEADERS; do
 	echo "Removing unused header $file..."
 	rm -f $NEWDIR/$file