diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-07 21:08:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-07 21:08:41 -0700 |
| commit | b6741d1fe947f829bd4303397fd888e1d4b66bae (patch) | |
| tree | a41c8cf58ddfd82d3083b666479a82df018297f7 /drivers/char/Makefile | |
| parent | acab460b0f618e1e9663eea8c52ad5edd552ed1d (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
| download | talos-obmc-linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.tar.gz talos-obmc-linux-b6741d1fe947f829bd4303397fd888e1d4b66bae.zip | |
Merge 3.1-rc1 into usb-linus
Gives us a good starting point to base patches off of.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 7a00672bd85d..32762ba769c2 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -63,3 +63,5 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o + +obj-$(CONFIG_TILE_SROM) += tile-srom.o |
