There's no reason for these to be separate packages. They come from the
same source tree, so having a single package makes more sense. I only
separated them originally because I wasn't sure exactly how to express
the proper options in the kconfig language.
