summaryrefslogtreecommitdiffstats
path: root/firmware/atmsar11.HEX
diff options
context:
space:
mode:
authorKumar Gala2008-09-22 23:52:19 +0200
committerJeff Garzik2008-09-25 04:11:53 +0200
commit83dad4c3773b2be110f9ab0c9031e6129bd2e294 (patch)
tree1ba35395a8ed73a080e7520bd0436e9ebf2552c8 /firmware/atmsar11.HEX
parentatl2: add tx bytes statistic (diff)
downloadkernel-qcow2-linux-83dad4c3773b2be110f9ab0c9031e6129bd2e294.tar.gz
kernel-qcow2-linux-83dad4c3773b2be110f9ab0c9031e6129bd2e294.tar.xz
kernel-qcow2-linux-83dad4c3773b2be110f9ab0c9031e6129bd2e294.zip
netdev: drop CONFIG_PPC_MERGE from Kconfig
Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms so we don't need to depend on it. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'firmware/atmsar11.HEX')
0 files changed, 0 insertions, 0 deletions