You really should use a visual diff program to cross your configuration.h and configuration_adv.h file over to the new code base. The reason is a number of options have been combined (and the name changed). And new options have been added. There aren't going to be that many differences, but you want to go through they one by one and make intelligent choices on each difference.