diff options
| author | Michael Young <m.a.young@durham.ac.uk> | 2010-09-03 22:04:30 +0100 |
|---|---|---|
| committer | Michael Young <m.a.young@durham.ac.uk> | 2010-09-03 22:04:30 +0100 |
| commit | 11574d71a51fbd19255e2d5798dbf52284a1a29c (patch) | |
| tree | 673cab071c28b9712b2f0037d719f8f6ca6776e3 /config-generic | |
| parent | c037070edb1f5a0c34505d879b65f0ad96dbd231 (diff) | |
| parent | b9204c294cb0512e7ec4c1480276126d8a40d6c3 (diff) | |
| download | dom0-kernel-11574d71a51fbd19255e2d5798dbf52284a1a29c.tar.gz dom0-kernel-11574d71a51fbd19255e2d5798dbf52284a1a29c.tar.xz dom0-kernel-11574d71a51fbd19255e2d5798dbf52284a1a29c.zip | |
Merge branch 'f12/master' into f12/user/myoung/xendom0
Conflicts:
kernel.spec
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-generic b/config-generic index fe84fdd..3669497 100644 --- a/config-generic +++ b/config-generic @@ -3781,8 +3781,8 @@ CONFIG_AUXDISPLAY=y CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_SMX=m -CONFIG_UIO_PDRV=m -CONFIG_UIO_PDRV_GENIRQ=m +# CONFIG_UIO_PDRV is not set +# CONFIG_UIO_PDRV_GENIRQ is not set CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m |