Merge branch 'linus' into x86/urgent
[linux-2.6] / drivers / ide / ppc / Makefile
1
2 obj-$(CONFIG_BLK_DEV_IDE_PMAC)          += pmac.o