Revision 119b3aa65d33533c2f8d8822bb7a3e62aa12f860 authored by Benjamin Herrenschmidt on 08 April 2008, 21:51:07 UTC, committed by Jeff Garzik on 09 April 2008, 05:06:33 UTC
Commit 0f436eff54f90419ac1b8accfb3e6e17c4b49a4e breaks build on arch/ppc as it doesn't implement the machine_is() macro. This fixes it by using CONFIG_PPC_MERGE instead which represents arch/powerpc only, while CONFIG_PPC is set for both. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
1 parent 7180c4c
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 2.0 KB |
| Kconfig.iosched | -rw-r--r-- | 1.9 KB |
| Makefile | -rw-r--r-- | 530 bytes |
| as-iosched.c | -rw-r--r-- | 38.1 KB |
| blk-barrier.c | -rw-r--r-- | 7.7 KB |
| blk-core.c | -rw-r--r-- | 53.8 KB |
| blk-exec.c | -rw-r--r-- | 2.6 KB |
| blk-ioc.c | -rw-r--r-- | 4.0 KB |
| blk-map.c | -rw-r--r-- | 7.1 KB |
| blk-merge.c | -rw-r--r-- | 12.1 KB |
| blk-settings.c | -rw-r--r-- | 13.2 KB |
| blk-sysfs.c | -rw-r--r-- | 7.6 KB |
| blk-tag.c | -rw-r--r-- | 9.5 KB |
| blk.h | -rw-r--r-- | 1.7 KB |
| blktrace.c | -rw-r--r-- | 11.4 KB |
| bsg.c | -rw-r--r-- | 22.4 KB |
| cfq-iosched.c | -rw-r--r-- | 53.9 KB |
| compat_ioctl.c | -rw-r--r-- | 22.0 KB |
| deadline-iosched.c | -rw-r--r-- | 11.5 KB |
| elevator.c | -rw-r--r-- | 25.9 KB |
| genhd.c | -rw-r--r-- | 17.8 KB |
| ioctl.c | -rw-r--r-- | 7.0 KB |
| noop-iosched.c | -rw-r--r-- | 2.6 KB |
| scsi_ioctl.c | -rw-r--r-- | 16.9 KB |
Computing file changes ...
