Appleinsider reports that an AT&T spokesperson has informed them that customers upgrading to the iPhone 3G could continue to use their original iPhone as a Wi-Fi iPod:
Use the Original iPhone as a Wi-Fi iPod
Use the Original iPhone as a Wi-Fi iPod