diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /drivers/ps3/Makefile | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'drivers/ps3/Makefile')
| -rw-r--r-- | drivers/ps3/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ps3/Makefile b/drivers/ps3/Makefile new file mode 100644 index 00000000000..8433eb7562c --- /dev/null +++ b/drivers/ps3/Makefile @@ -0,0 +1,2 @@ +obj-y += system-bus.o +obj-$(CONFIG_PS3_VUART) += vuart.o |