diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/rio/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/rio/Makefile')
| -rw-r--r-- | drivers/char/rio/Makefile | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/char/rio/Makefile b/drivers/char/rio/Makefile deleted file mode 100644 index 2d1c5a7cba7d..000000000000 --- a/drivers/char/rio/Makefile +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | # | ||
| 2 | # Makefile for the linux rio-subsystem. | ||
| 3 | # | ||
| 4 | # (C) R.E.Wolff@BitWizard.nl | ||
| 5 | # | ||
| 6 | # This file is GPL. See other files for the full Blurb. I'm lazy today. | ||
| 7 | # | ||
| 8 | |||
| 9 | obj-$(CONFIG_RIO) += rio.o | ||
| 10 | |||
| 11 | rio-objs := rio_linux.o rioinit.o rioboot.o riocmd.o rioctrl.o riointr.o \ | ||
| 12 | rioparam.o rioroute.o riotable.o riotty.o | ||