diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 18:27:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 18:27:50 -0700 |
| commit | fc15bc817eecd5c13581adab2a182c07edededa0 (patch) | |
| tree | 4495364581afd49596e88882f58a2f1196bc512f /drivers/Makefile | |
| parent | a8dcf12f9e8ba113251c04d602f1695d537fb142 (diff) | |
| parent | bc4c4f45acbe1f1528d654b0b1793f25c175bf8f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6:
UIO: Hilscher CIF card driver
UIO: Documentation
UIO: Add the User IO core code
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 6d9d7fab77f..c34c8efff60 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_ATA) += ata/ obj-$(CONFIG_FUSION) += message/ obj-$(CONFIG_FIREWIRE) += firewire/ obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-$(CONFIG_UIO) += uio/ obj-y += cdrom/ obj-y += auxdisplay/ obj-$(CONFIG_MTD) += mtd/ |