diff options
| author | Kyle McMartin <kyle@redhat.com> | 2011-03-18 13:15:43 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2011-03-18 13:15:43 -0400 |
| commit | 3f74cb629de607844ea60d7371c60ac2a6b8d36b (patch) | |
| tree | c3fb276ff9f4bf209ac0b8777ee0121b9ee36fed /config-x86-generic | |
| parent | a725c00ed421e4eea7d02f5f2aea99f8f7de29df (diff) | |
| download | kernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.tar.gz kernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.tar.xz kernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.zip | |
update to 2.6.38-git6
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config-x86-generic b/config-x86-generic index 57ee12203..5a9766bc4 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -372,6 +372,9 @@ CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_XEN_KBDDEV_FRONTEND=y CONFIG_XEN_BLKDEV_FRONTEND=m CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_XEN_WDT=m +CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XENFS=m CONFIG_XEN_COMPAT_XENFS=y @@ -401,6 +404,8 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y CONFIG_MACINTOSH_DRIVERS=y CONFIG_DMIID=y +CONFIG_DMI_SYSFS=y + CONFIG_ISCSI_IBFT_FIND=y CONFIG_ISCSI_IBFT=m @@ -421,6 +426,9 @@ CONFIG_OLPC_OPENFIRMWARE=y CONFIG_BATTERY_OLPC=y CONFIG_MOUSE_PS2_OLPC=y +# staging +# CONFIG_FB_OLPC_DCON is not set + CONFIG_STRICT_DEVMEM=y # CONFIG_NO_BOOTMEM is not set |