This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Ben Hutchings 34a430d7bd dsa: Allow core and drivers to be built as modules ...

Change the kconfig types to tristate and adjust the condition for
declaring net_device::dsa_ptr to allow for this.

Adjust the makefile so that if NET_DSA_MV88E6123_61_65=y and
NET_DSA_MV88E6131=m or vice versa then both drivers are built-in.  We
could leave these options as bool and make NET_DSA_MV88E6XXX a
user-selected option, but that would break existing configurations.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

2011-11-26 14:48:16 -05:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2011-11-07 10:13:52 -08:00

asm-generic

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2011-11-17 13:11:43 -05:00

crypto

crypto: Add a report function pointer to crypto_type

2011-10-21 14:24:03 +02:00

drm

drm/radeon: add some missing FireMV pci ids

2011-11-15 19:43:06 +00:00

keys

…

linux

dsa: Allow core and drivers to be built as modules

2011-11-26 14:48:16 -05:00

math-emu

…

media

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

misc

[media] altera-stapl: it is time to move out from staging

2011-09-23 15:00:57 -03:00

mtd

mtd: kill old field for `struct mtd_info_user'

2011-09-11 15:57:44 +03:00

net

dsa: Change dsa_uses_{dsa, trailer}_tags() into inline functions

2011-11-26 14:48:14 -05:00

pcmcia

…

rdma

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2011-11-01 10:51:38 -07:00

rxrpc

…

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-10-28 16:44:18 -07:00

sound

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2011-11-06 19:00:42 -08:00

trace

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

video

Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next

2011-10-15 00:19:52 +00:00

xen

xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI

2011-11-16 12:13:42 -05:00

Kbuild

…