NOR flash partitions gone

I did a git pull of Josh's for-2.6.25 tree. Now the NOR partitions are 
no longer setup.

				nor_flash@0,0 {
					compatible = "amd,s29gl032a", "cfi-flash";
					bank-width = <2>;
					reg = <0 0 400000>;
					#address-cells = <1>;
					#size-cells = <1>;
					partition@300000 {
						label = "fpga";
						reg = <300000 40000>;
					};
					partition@340000 {
						label = "env";
						reg = <340000 40000>;
					};
					partition@380000 {
						label = "u-boot";
						reg = <380000 80000>;
					};
				};



It still detects the chip, it just doesn't configure the partitions. Any 
ideas?

Cheers,
   Sean