More driver & header fixes for 2.6.32 kernel/init merge (compiles)