diff -urNp linux-2.6.20-rc6/arch/arm/common/sa1111.c linux-2.6.20-rc6-sizes/arch/arm/common/sa1111.c
--- linux-2.6.20-rc6/arch/arm/common/sa1111.c	2007-01-27 17:39:16.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/common/sa1111.c	2007-01-28 22:33:09.000000000 +0000
@@ -32,7 +32,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/hardware/sa1111.h>
 
diff -urNp linux-2.6.20-rc6/arch/arm/mach-aaec2000/core.c linux-2.6.20-rc6-sizes/arch/arm/mach-aaec2000/core.c
--- linux-2.6.20-rc6/arch/arm/mach-aaec2000/core.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-aaec2000/core.c	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-clps711x/autcpu12.c linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/autcpu12.c
--- linux-2.6.20-rc6/arch/arm/mach-clps711x/autcpu12.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/autcpu12.c	2007-01-28 22:33:09.000000000 +0000
@@ -24,7 +24,7 @@
 #include <linux/mm.h>
 
 #include <asm/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-clps711x/ceiva.c linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/ceiva.c
--- linux-2.6.20-rc6/arch/arm/mach-clps711x/ceiva.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/ceiva.c	2007-01-28 22:33:09.000000000 +0000
@@ -30,7 +30,7 @@
 #include <asm/hardware.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/map.h>
 
diff -urNp linux-2.6.20-rc6/arch/arm/mach-clps711x/edb7211-mm.c linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/edb7211-mm.c
--- linux-2.6.20-rc6/arch/arm/mach-clps711x/edb7211-mm.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/edb7211-mm.c	2007-01-28 22:33:09.000000000 +0000
@@ -25,7 +25,7 @@
 #include <asm/hardware.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
  
 #include <asm/mach/map.h>
 
diff -urNp linux-2.6.20-rc6/arch/arm/mach-clps711x/mm.c linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/mm.c
--- linux-2.6.20-rc6/arch/arm/mach-clps711x/mm.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/mm.c	2007-01-28 22:33:09.000000000 +0000
@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-clps711x/p720t.c linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/p720t.c
--- linux-2.6.20-rc6/arch/arm/mach-clps711x/p720t.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-clps711x/p720t.c	2007-01-28 22:33:09.000000000 +0000
@@ -28,7 +28,7 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-integrator/impd1.c linux-2.6.20-rc6-sizes/arch/arm/mach-integrator/impd1.c
--- linux-2.6.20-rc6/arch/arm/mach-integrator/impd1.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-integrator/impd1.c	2007-01-28 22:33:09.000000000 +0000
@@ -25,7 +25,7 @@
 #include <asm/hardware/icst525.h>
 #include <asm/arch/lm.h>
 #include <asm/arch/impd1.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include "clock.h"
 
diff -urNp linux-2.6.20-rc6/arch/arm/mach-iop13xx/pci.c linux-2.6.20-rc6-sizes/arch/arm/mach-iop13xx/pci.c
--- linux-2.6.20-rc6/arch/arm/mach-iop13xx/pci.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-iop13xx/pci.c	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include <asm/irq.h>
 #include <asm/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/pci.h>
 
diff -urNp linux-2.6.20-rc6/arch/arm/mach-ixp23xx/pci.c linux-2.6.20-rc6-sizes/arch/arm/mach-ixp23xx/pci.c
--- linux-2.6.20-rc6/arch/arm/mach-ixp23xx/pci.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-ixp23xx/pci.c	2007-01-28 22:33:09.000000000 +0000
@@ -28,7 +28,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/system.h>
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-ixp4xx/common-pci.c linux-2.6.20-rc6-sizes/arch/arm/mach-ixp4xx/common-pci.c
--- linux-2.6.20-rc6/arch/arm/mach-ixp4xx/common-pci.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-ixp4xx/common-pci.c	2007-01-28 22:33:09.000000000 +0000
@@ -29,7 +29,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/system.h>
 #include <asm/mach/pci.h>
 #include <asm/hardware.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-pxa/lpd270.c linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/lpd270.c
--- linux-2.6.20-rc6/arch/arm/mach-pxa/lpd270.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/lpd270.c	2007-01-28 22:33:09.000000000 +0000
@@ -30,7 +30,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-pxa/lubbock.c linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/lubbock.c
--- linux-2.6.20-rc6/arch/arm/mach-pxa/lubbock.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/lubbock.c	2007-01-28 22:33:09.000000000 +0000
@@ -31,7 +31,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-pxa/mainstone.c linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/mainstone.c
--- linux-2.6.20-rc6/arch/arm/mach-pxa/mainstone.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/mainstone.c	2007-01-28 22:33:09.000000000 +0000
@@ -30,7 +30,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-pxa/trizeps4.c linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/trizeps4.c
--- linux-2.6.20-rc6/arch/arm/mach-pxa/trizeps4.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-pxa/trizeps4.c	2007-01-28 22:33:09.000000000 +0000
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mach-sa1100/neponset.c linux-2.6.20-rc6-sizes/arch/arm/mach-sa1100/neponset.c
--- linux-2.6.20-rc6/arch/arm/mach-sa1100/neponset.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mach-sa1100/neponset.c	2007-01-28 22:33:09.000000000 +0000
@@ -20,7 +20,7 @@
 #include <asm/arch/assabet.h>
 #include <asm/arch/neponset.h>
 #include <asm/hardware/sa1111.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * Install handler for Neponset IRQ.  Note that we have to loop here
diff -urNp linux-2.6.20-rc6/arch/arm/mm/consistent.c linux-2.6.20-rc6-sizes/arch/arm/mm/consistent.c
--- linux-2.6.20-rc6/arch/arm/mm/consistent.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mm/consistent.c	2007-01-28 22:33:09.000000000 +0000
@@ -21,7 +21,7 @@
 #include <asm/memory.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /* Sanity check size */
 #if (CONSISTENT_DMA_SIZE % SZ_2M)
diff -urNp linux-2.6.20-rc6/arch/arm/mm/init.c linux-2.6.20-rc6-sizes/arch/arm/mm/init.c
--- linux-2.6.20-rc6/arch/arm/mm/init.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mm/init.c	2007-01-28 22:33:09.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/tlb.h>
 
 #include <asm/mach/arch.h>
diff -urNp linux-2.6.20-rc6/arch/arm/mm/ioremap.c linux-2.6.20-rc6-sizes/arch/arm/mm/ioremap.c
--- linux-2.6.20-rc6/arch/arm/mm/ioremap.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mm/ioremap.c	2007-01-28 22:33:09.000000000 +0000
@@ -30,7 +30,7 @@
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * Used by ioremap() and iounmap() code to mark (super)section-mapped
diff -urNp linux-2.6.20-rc6/arch/arm/mm/mmu.c linux-2.6.20-rc6-sizes/arch/arm/mm/mmu.c
--- linux-2.6.20-rc6/arch/arm/mm/mmu.c	2007-01-27 17:39:17.000000000 +0000
+++ linux-2.6.20-rc6-sizes/arch/arm/mm/mmu.c	2007-01-28 22:33:09.000000000 +0000
@@ -17,7 +17,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/setup.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/tlb.h>
 
 #include <asm/mach/arch.h>
diff -urNp linux-2.6.20-rc6/drivers/amba/bus.c linux-2.6.20-rc6-sizes/drivers/amba/bus.c
--- linux-2.6.20-rc6/drivers/amba/bus.c	2007-01-27 17:39:18.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/amba/bus.c	2007-01-28 22:33:09.000000000 +0000
@@ -15,7 +15,7 @@
 #include <linux/amba/bus.h>
 
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #define to_amba_device(d)	container_of(d, struct amba_device, dev)
 #define to_amba_driver(d)	container_of(d, struct amba_driver, drv)
diff -urNp linux-2.6.20-rc6/drivers/mmc/imxmmc.c linux-2.6.20-rc6-sizes/drivers/mmc/imxmmc.c
--- linux-2.6.20-rc6/drivers/mmc/imxmmc.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mmc/imxmmc.c	2007-01-28 22:33:09.000000000 +0000
@@ -47,7 +47,7 @@
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/imx-dma.h>
 
diff -urNp linux-2.6.20-rc6/drivers/mmc/mmci.c linux-2.6.20-rc6-sizes/drivers/mmc/mmci.c
--- linux-2.6.20-rc6/drivers/mmc/mmci.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mmc/mmci.c	2007-01-28 22:33:09.000000000 +0000
@@ -25,7 +25,7 @@
 #include <asm/div64.h>
 #include <asm/io.h>
 #include <asm/scatterlist.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/mach/mmc.h>
 
 #include "mmci.h"
diff -urNp linux-2.6.20-rc6/drivers/mmc/pxamci.c linux-2.6.20-rc6-sizes/drivers/mmc/pxamci.c
--- linux-2.6.20-rc6/drivers/mmc/pxamci.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mmc/pxamci.c	2007-01-28 22:33:09.000000000 +0000
@@ -29,7 +29,7 @@
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/scatterlist.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mmc.h>
diff -urNp linux-2.6.20-rc6/drivers/mtd/maps/autcpu12-nvram.c linux-2.6.20-rc6-sizes/drivers/mtd/maps/autcpu12-nvram.c
--- linux-2.6.20-rc6/drivers/mtd/maps/autcpu12-nvram.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/maps/autcpu12-nvram.c	2007-01-28 22:33:09.000000000 +0000
@@ -26,7 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/hardware.h>
 #include <asm/arch/autcpu12.h>
 #include <linux/mtd/mtd.h>
diff -urNp linux-2.6.20-rc6/drivers/mtd/maps/ceiva.c linux-2.6.20-rc6-sizes/drivers/mtd/maps/ceiva.c
--- linux-2.6.20-rc6/drivers/mtd/maps/ceiva.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/maps/ceiva.c	2007-01-28 22:33:09.000000000 +0000
@@ -29,7 +29,7 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * This isn't complete yet, so...
diff -urNp linux-2.6.20-rc6/drivers/mtd/maps/sa1100-flash.c linux-2.6.20-rc6-sizes/drivers/mtd/maps/sa1100-flash.c
--- linux-2.6.20-rc6/drivers/mtd/maps/sa1100-flash.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/maps/sa1100-flash.c	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/mach/flash.h>
 
 #if 0
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/ams-delta.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/ams-delta.c
--- linux-2.6.20-rc6/drivers/mtd/nand/ams-delta.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/ams-delta.c	2007-01-28 22:33:09.000000000 +0000
@@ -23,7 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/board-ams-delta.h>
 
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/at91_nand.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/at91_nand.c
--- linux-2.6.20-rc6/drivers/mtd/nand/at91_nand.c	2007-01-27 17:39:19.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/at91_nand.c	2007-01-28 22:33:09.000000000 +0000
@@ -23,7 +23,7 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/hardware.h>
 #include <asm/arch/board.h>
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/autcpu12.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/autcpu12.c
--- linux-2.6.20-rc6/drivers/mtd/nand/autcpu12.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/autcpu12.c	2007-01-28 22:33:09.000000000 +0000
@@ -35,7 +35,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/autcpu12.h>
 
 /*
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/edb7312.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/edb7312.c
--- linux-2.6.20-rc6/drivers/mtd/nand/edb7312.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/edb7312.c	2007-01-28 22:33:09.000000000 +0000
@@ -26,7 +26,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>	/* for CLPS7111_VIRT_BASE */
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/hardware/clps7111.h>
 
 /*
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/h1910.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/h1910.c
--- linux-2.6.20-rc6/drivers/mtd/nand/h1910.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/h1910.c	2007-01-28 22:33:09.000000000 +0000
@@ -27,7 +27,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>	/* for CLPS7111_VIRT_BASE */
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/h1900-gpio.h>
 #include <asm/arch/ipaq.h>
 
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/toto.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/toto.c
--- linux-2.6.20-rc6/drivers/mtd/nand/toto.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/toto.c	2007-01-28 22:33:09.000000000 +0000
@@ -27,7 +27,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/toto.h>
 #include <asm/arch-omap1510/hardware.h>
 #include <asm/arch/gpio.h>
diff -urNp linux-2.6.20-rc6/drivers/mtd/nand/ts7250.c linux-2.6.20-rc6-sizes/drivers/mtd/nand/ts7250.c
--- linux-2.6.20-rc6/drivers/mtd/nand/ts7250.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/mtd/nand/ts7250.c	2007-01-28 22:33:09.000000000 +0000
@@ -28,7 +28,7 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/mach-types.h>
 
 /*
diff -urNp linux-2.6.20-rc6/drivers/pcmcia/at91_cf.c linux-2.6.20-rc6-sizes/drivers/pcmcia/at91_cf.c
--- linux-2.6.20-rc6/drivers/pcmcia/at91_cf.c	2007-01-27 17:39:20.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/pcmcia/at91_cf.c	2007-01-28 22:33:09.000000000 +0000
@@ -21,7 +21,7 @@
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
diff -urNp linux-2.6.20-rc6/drivers/pcmcia/omap_cf.c linux-2.6.20-rc6-sizes/drivers/pcmcia/omap_cf.c
--- linux-2.6.20-rc6/drivers/pcmcia/omap_cf.c	2007-01-27 17:39:20.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/pcmcia/omap_cf.c	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 
 #include <asm/hardware.h>
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
diff -urNp linux-2.6.20-rc6/drivers/serial/amba-pl011.c linux-2.6.20-rc6-sizes/drivers/serial/amba-pl011.c
--- linux-2.6.20-rc6/drivers/serial/amba-pl011.c	2007-01-27 17:39:20.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/serial/amba-pl011.c	2007-01-28 22:33:09.000000000 +0000
@@ -51,7 +51,7 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #define UART_NR			14
 
diff -urNp linux-2.6.20-rc6/drivers/video/amba-clcd.c linux-2.6.20-rc6-sizes/drivers/video/amba-clcd.c
--- linux-2.6.20-rc6/drivers/video/amba-clcd.c	2007-01-27 17:39:21.000000000 +0000
+++ linux-2.6.20-rc6-sizes/drivers/video/amba-clcd.c	2007-01-28 22:33:09.000000000 +0000
@@ -25,7 +25,7 @@
 #include <linux/amba/clcd.h>
 #include <linux/clk.h>
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #define to_clcd(info)	container_of(info, struct clcd_fb, fb)
 
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-aaec2000/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-aaec2000/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-aaec2000/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-aaec2000/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -11,7 +11,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/aaec2000.h>
 
 /* The kernel is loaded at physical address 0xf8000000.
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-at91rm9200/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-at91rm9200/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-at91rm9200/hardware.h	2007-01-27 17:39:22.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-at91rm9200/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -14,7 +14,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #if defined(CONFIG_ARCH_AT91RM9200)
 #include <asm/arch/at91rm9200.h>
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-imx/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-imx/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-imx/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-imx/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include "imx-regs.h"
 
 #ifndef __ASSEMBLY__
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-integrator/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-integrator/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-integrator/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-integrator/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/platform.h>
 
 /*
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-ixp4xx/dma.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-ixp4xx/dma.h
--- linux-2.6.20-rc6/include/asm-arm/arch-ixp4xx/dma.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-ixp4xx/dma.h	2007-01-28 22:33:09.000000000 +0000
@@ -14,7 +14,7 @@
 #include <linux/device.h>
 #include <linux/pci.h>
 #include <asm/page.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/hardware.h>
 
 #define MAX_DMA_ADDRESS		(PAGE_OFFSET + SZ_64M)
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-ixp4xx/memory.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-ixp4xx/memory.h
--- linux-2.6.20-rc6/include/asm-arm/arch-ixp4xx/memory.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-ixp4xx/memory.h	2007-01-28 22:33:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * Physical DRAM offset.
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-lh7a40x/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-lh7a40x/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-lh7a40x/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-lh7a40x/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>		/* Added for the sake of amba-clcd driver */
+#include <linux/sizes.h>		/* Added for the sake of amba-clcd driver */
 
 #define io_p2v(x) (0xf0000000 | (((x) & 0xfff00000) >> 4) | ((x) & 0x0000ffff))
 #define io_v2p(x) (             (((x) & 0x0fff0000) << 4) | ((x) & 0x0000ffff))
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-omap/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-omap/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-omap/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-omap/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -36,7 +36,7 @@
 #ifndef __ASM_ARCH_OMAP_HARDWARE_H
 #define __ASM_ARCH_OMAP_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #ifndef __ASSEMBLER__
 #include <asm/types.h>
 #include <asm/arch/cpu.h>
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-pnx4008/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-pnx4008/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-pnx4008/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-pnx4008/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/platform.h>
 
 /* Start of virtual addresses for IO devices */
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-realview/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-realview/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-realview/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-realview/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/platform.h>
 
 /* macro to get at IO space when running virtually */
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-s3c2410/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-s3c2410/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-s3c2410/hardware.h	2007-01-27 17:39:22.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-s3c2410/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -102,7 +102,7 @@ extern int s3c2440_set_dsc(unsigned int 
 
 #endif /* __ASSEMBLY__ */
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/map.h>
 
 /* machine specific hardware definitions should go after this */
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-sa1100/memory.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-sa1100/memory.h
--- linux-2.6.20-rc6/include/asm-arm/arch-sa1100/memory.h	2007-01-27 17:39:22.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-sa1100/memory.h	2007-01-28 22:33:09.000000000 +0000
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * Physical DRAM offset is 0xc0000000 on the SA1100
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-shark/memory.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-shark/memory.h
--- linux-2.6.20-rc6/include/asm-arm/arch-shark/memory.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-shark/memory.h	2007-01-28 22:33:09.000000000 +0000
@@ -10,7 +10,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 /*
  * Physical DRAM offset.
diff -urNp linux-2.6.20-rc6/include/asm-arm/arch-versatile/hardware.h linux-2.6.20-rc6-sizes/include/asm-arm/arch-versatile/hardware.h
--- linux-2.6.20-rc6/include/asm-arm/arch-versatile/hardware.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/arch-versatile/hardware.h	2007-01-28 22:33:09.000000000 +0000
@@ -22,7 +22,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 #include <asm/arch/platform.h>
 
 /*
diff -urNp linux-2.6.20-rc6/include/asm-arm/memory.h linux-2.6.20-rc6-sizes/include/asm-arm/memory.h
--- linux-2.6.20-rc6/include/asm-arm/memory.h	2007-01-27 17:39:22.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/memory.h	2007-01-28 22:33:09.000000000 +0000
@@ -25,7 +25,7 @@
 
 #include <linux/compiler.h>
 #include <asm/arch/memory.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #ifdef CONFIG_MMU
 
diff -urNp linux-2.6.20-rc6/include/asm-arm/sizes.h linux-2.6.20-rc6-sizes/include/asm-arm/sizes.h
--- linux-2.6.20-rc6/include/asm-arm/sizes.h	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/include/asm-arm/sizes.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-/* DO NOT EDIT!! - this file automatically generated
- *                 from .s file by awk -f s2h.awk
- */
-/*  Size definitions
- *  Copyright (C) ARM Limited 1998. All rights reserved.
- */
-
-#ifndef __sizes_h
-#define __sizes_h                       1
-
-/* handy sizes */
-#define SZ_1K                           0x00000400
-#define SZ_4K                           0x00001000
-#define SZ_8K                           0x00002000
-#define SZ_16K                          0x00004000
-#define SZ_64K                          0x00010000
-#define SZ_128K                         0x00020000
-#define SZ_256K                         0x00040000
-#define SZ_512K                         0x00080000
-
-#define SZ_1M                           0x00100000
-#define SZ_2M                           0x00200000
-#define SZ_4M                           0x00400000
-#define SZ_8M                           0x00800000
-#define SZ_16M                          0x01000000
-#define SZ_32M                          0x02000000
-#define SZ_64M                          0x04000000
-#define SZ_128M                         0x08000000
-#define SZ_256M                         0x10000000
-#define SZ_512M                         0x20000000
-
-#define SZ_1G                           0x40000000
-#define SZ_2G                           0x80000000
-
-#endif
-
-/*         END */
diff -urNp linux-2.6.20-rc6/include/linux/sizes.h linux-2.6.20-rc6-sizes/include/linux/sizes.h
--- linux-2.6.20-rc6/include/linux/sizes.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.20-rc6-sizes/include/linux/sizes.h	2006-11-29 21:57:37.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+/* DO NOT EDIT!! - this file automatically generated
+ *                 from .s file by awk -f s2h.awk
+ */
+/*  Size definitions
+ *  Copyright (C) ARM Limited 1998. All rights reserved.
+ */
+
+#ifndef __sizes_h
+#define __sizes_h                       1
+
+/* handy sizes */
+#define SZ_1K                           0x00000400
+#define SZ_4K                           0x00001000
+#define SZ_8K                           0x00002000
+#define SZ_16K                          0x00004000
+#define SZ_64K                          0x00010000
+#define SZ_128K                         0x00020000
+#define SZ_256K                         0x00040000
+#define SZ_512K                         0x00080000
+
+#define SZ_1M                           0x00100000
+#define SZ_2M                           0x00200000
+#define SZ_4M                           0x00400000
+#define SZ_8M                           0x00800000
+#define SZ_16M                          0x01000000
+#define SZ_32M                          0x02000000
+#define SZ_64M                          0x04000000
+#define SZ_128M                         0x08000000
+#define SZ_256M                         0x10000000
+#define SZ_512M                         0x20000000
+
+#define SZ_1G                           0x40000000
+#define SZ_2G                           0x80000000
+
+#endif
+
+/*         END */
diff -urNp linux-2.6.20-rc6/sound/arm/aaci.c linux-2.6.20-rc6-sizes/sound/arm/aaci.c
--- linux-2.6.20-rc6/sound/arm/aaci.c	2006-11-29 21:57:37.000000000 +0000
+++ linux-2.6.20-rc6-sizes/sound/arm/aaci.c	2007-01-28 22:33:09.000000000 +0000
@@ -21,7 +21,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>

