diff options
| author | Benjamin Herrenschmidt <[email protected]> | 2008-04-09 07:51:07 +1000 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2008-04-09 01:06:33 -0400 |
| commit | 119b3aa65d33533c2f8d8822bb7a3e62aa12f860 (patch) | |
| tree | 84aae81374affcbbfae3288ba90e9059b8bed5c0 /net/unix/sysctl_net_unix.c | |
| parent | 7180c4c9e09888db0a188f729c96c6d7bd61fa83 (diff) | |
pata_sil680: Fix build on arch/ppc
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 <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions