David, here's an updated patch that doesn't mess with
arch/ia64/Makefile in case you hadn't applied the last one yet