diff options
| author | Kumar Gala <[email protected]> | 2008-09-22 14:47:33 -0700 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2008-09-29 00:28:02 -0400 |
| commit | 47d692a946f12c299c21536fff6b39369311f002 (patch) | |
| tree | 6b104571f6b351155a20f6d1d79da7244a3ea3ee /net/unix/sysctl_net_unix.c | |
| parent | 45fabbb77bd95adff7a80bde1c7a0ace1075fde6 (diff) | |
pata_sil680: convert CONFIG_PPC_MERGE to CONFIG_PPC
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all
powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use
CONFIG_PPC instead.
Signed-off-by: Kumar Gala <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Alan Cox <[email protected]>
Signed-off-by: Andrew Morton <[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