Index: linux-2.6.16.5-new/drivers/serial/pxa.c
===================================================================
--- linux-2.6.16.5-new.orig/drivers/serial/pxa.c	2006-04-17 13:55:42.000000000 +0200
+++ linux-2.6.16.5-new/drivers/serial/pxa.c	2006-04-17 13:56:18.000000000 +0200
@@ -915,8 +915,10 @@
 	if (ret != 0)
 		uart_unregister_driver(&serial_pxa_reg);
 
+#ifdef CONFIG_DPM
 	if (! ret)
 		dpm_register_scale(&serial_pxa_nb, SCALE_POSTCHANGE);
+#endif
 
 	return ret;
 }
@@ -925,7 +927,9 @@
 {
 	platform_driver_unregister(&serial_pxa_driver);
 	uart_unregister_driver(&serial_pxa_reg);
+#ifdef CONFIG_DPM
 	dpm_unregister_scale(&serial_pxa_nb, SCALE_POSTCHANGE);
+#endif
 }
 
 module_init(serial_pxa_init);