diff -c -r linux/fs/jffs2/build.c linux-modified/fs/jffs2/build.c
*** linux/fs/jffs2/build.c	2003-05-14 06:01:21.000000000 +0000
--- linux-modified/fs/jffs2/build.c	2004-09-08 16:59:19.000000000 +0000
***************
*** 295,307 ****
  
  	c->free_size = c->flash_size;
  	c->nr_blocks = c->flash_size / c->sector_size;
- #ifdef CONFIG_ARCH_PXA_HUSKY
  	c->blocks = consistent_alloc(GFP_KERNEL,
  				     sizeof(struct jffs2_eraseblock) * c->nr_blocks,
  				     &c->blocks_phys);
- #else
- 	c->blocks = kmalloc(sizeof(struct jffs2_eraseblock) * c->nr_blocks, GFP_KERNEL);
- #endif
  	if (!c->blocks)
  		return -ENOMEM;
  	for (i=0; i<c->nr_blocks; i++) {
--- 295,303 ----
***************
*** 341,353 ****
  		D1(printk(KERN_DEBUG "build_fs failed\n"));
  		jffs2_free_ino_caches(c);
  		jffs2_free_raw_node_refs(c);
- #ifdef CONFIG_ARCH_PXA_HUSKY
  		consistent_free( c->blocks,
  				 sizeof(struct jffs2_eraseblock) * c->nr_blocks,
  				 c->blocks_phys );
- #else
- 		kfree(c->blocks);
- #endif
  		return -EIO;
  	}
  	return 0;
--- 337,345 ----
diff -c -r linux/fs/jffs2/fs.c linux-modified/fs/jffs2/fs.c
*** linux/fs/jffs2/fs.c	2003-05-14 06:01:21.000000000 +0000
--- linux-modified/fs/jffs2/fs.c	2004-09-08 16:57:10.000000000 +0000
***************
*** 402,414 ****
   out_nodes:
  	jffs2_free_ino_caches(c);
  	jffs2_free_raw_node_refs(c);
- #ifdef CONFIG_ARCH_PXA_HUSKY
  	consistent_free( c->blocks,
  			 sizeof(struct jffs2_eraseblock) * c->nr_blocks,
  			 c->blocks_phys );
- #else
- 	kfree(c->blocks);
- #endif
   out_inohash:
  	kfree(c->inocache_list);
   out_wbuf:
--- 402,410 ----
diff -c -r linux/fs/jffs2/nodelist.h linux-modified/fs/jffs2/nodelist.h
*** linux/fs/jffs2/nodelist.h	2003-06-19 08:23:10.000000000 +0000
--- linux-modified/fs/jffs2/nodelist.h	2004-09-08 16:57:22.000000000 +0000
***************
*** 234,244 ****
  #define JFFS2_RESERVED_BLOCKS_GCBAD (JFFS2_RESERVED_BLOCKS_BASE + 1)		/* ... pick a block from the bad_list to GC */
  #define JFFS2_RESERVED_BLOCKS_GCMERGE (JFFS2_RESERVED_BLOCKS_BASE)		/* ... merge pages when garbage collecting */
  
- #ifdef CONFIG_ARCH_PXA_HUSKY
  #define JFFS2_RESERVED_BLOCKS_BAD 80
- #else
- #define JFFS2_RESERVED_BLOCKS_BAD 24
- #endif
  
  #define JFFS2_RESERVED_BLOCKS_ROOT 5
  #define JFFS2_RESERVED_BLOCKS_DIRTY 24
--- 234,240 ----
diff -c -r linux/fs/jffs2/super.c linux-modified/fs/jffs2/super.c
*** linux/fs/jffs2/super.c	2003-05-14 06:01:21.000000000 +0000
--- linux-modified/fs/jffs2/super.c	2004-09-08 16:57:33.000000000 +0000
***************
*** 263,275 ****
  	up(&c->alloc_sem);
  	jffs2_free_ino_caches(c);
  	jffs2_free_raw_node_refs(c);
- #ifdef CONFIG_ARCH_PXA_HUSKY
  	consistent_free( c->blocks,
  			 sizeof(struct jffs2_eraseblock) * c->nr_blocks,
  			 c->blocks_phys );
- #else
- 	kfree(c->blocks);
- #endif
  	if (c->wbuf)
  		kfree(c->wbuf);
  	kfree(c->inocache_list);
--- 263,271 ----
diff -c -r linux/fs/jffs2/super-v24.c linux-modified/fs/jffs2/super-v24.c
*** linux/fs/jffs2/super-v24.c	2003-05-14 06:01:21.000000000 +0000
--- linux-modified/fs/jffs2/super-v24.c	2004-09-08 16:57:44.000000000 +0000
***************
*** 106,118 ****
  	up(&c->alloc_sem);
  	jffs2_free_ino_caches(c);
  	jffs2_free_raw_node_refs(c);
- #ifdef CONFIG_ARCH_PXA_HUSKY
  	consistent_free( c->blocks,
  			 sizeof(struct jffs2_eraseblock) * c->nr_blocks,
  			 c->blocks_phys );
- #else
- 	kfree(c->blocks);
- #endif
  	if (c->mtd->sync)
  		c->mtd->sync(c->mtd);
  	put_mtd_device(c->mtd);
--- 106,114 ----