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)
commitea088b8d481fcff001f7e628c44daf39a229d9fc
treebcb75959da3303ffc705885eb6de5d5ed3378ef4
parentc05b47704570b015134522c36142cd17bd48640a
parent732b82886017e9ceccb27c8b69e9210d5305088a
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* 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