Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Mar 2006 23:30:32 +0000 (15:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Mar 2006 23:30:32 +0000 (15:30 -0800)
* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] au1xmmc: Fix a compilation warning ('status' is not used)
  [MMC] au1xmmc: Fix linking error because mmc_rsp_type doesn't exist
  [MMC] au1xmmc: Fix compilation error by using platform_driver


Trivial merge