The CARDBUS config file says its GENERIC plus Cardbus support.
A squiz show's its missing at least

  dpt* at pci?
  dpt* at eisa?
  adv0 at isa?
  'flags 0x00'	for wdc0 and wdc1
  sip*	 at pci?
  tlp*	 at pci?	(Jason's new driver)
  rl*	 at pci?	(realtke driver)

  wi*	 at pcmcia?
  mhzc*	 at pcmcia?
  com*	 at mhzc?
  sm*	 at mhzc?

  umodem at uhub?
  umass* at uhub?
  scsibus* at umass?

  uaudio*  at uhub?
  ugen	   at uhub?

  eso*	   at pci?
  opl*	   at eso?

  audio*   at eso?
  audio*   at uaudio?

  ... all the MPU401 attachments, which breaks audio compilation
  
I'm guessing this is simply due to commits to -current's i386/conf/GENERIC
thatp happened after Hayakawa-san prepared patches for commit.
Is there any reason not to add all the above?
How about the wsmouse/wskbd and pms0 changes?

--Jonathan