From aed37fd805fe6aad54eae13ad1355104d90f6b61 Mon Sep 17 00:00:00 2001 From: Sonny Rao Date: Thu, 18 Jun 2009 15:14:36 +0000 Subject: [PATCH] --- yaml --- r: 154399 b: refs/heads/master c: e4031d52c57b17c76bbdb15fcf1a32a9f87d9756 h: refs/heads/master i: 154397: 62b9f57cf5405fafd092101c2bbcb7a6a669c989 154395: b7e439dd74034dd727d022cc2be06dacca6ef295 154391: 267edb312dadbba366abf96247c5214b499a48c8 154383: ec7ee99ec28217d30115f77fe3b22e9a05d3c6aa 154367: 07a40233bfcdaedb1435dc7318105717ee00abe7 v: v3 --- [refs] | 2 +- trunk/drivers/char/bsr.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a94886305da8..b7586b25f9ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a5cbf17c49a6024a6d7baf03efdffb8ed252bb1 +refs/heads/master: e4031d52c57b17c76bbdb15fcf1a32a9f87d9756 diff --git a/trunk/drivers/char/bsr.c b/trunk/drivers/char/bsr.c index 140ea10ecb88..7d9fd8a8dfd0 100644 --- a/trunk/drivers/char/bsr.c +++ b/trunk/drivers/char/bsr.c @@ -75,12 +75,13 @@ static struct class *bsr_class; static int bsr_major; enum { - BSR_8 = 0, - BSR_16 = 1, - BSR_64 = 2, - BSR_128 = 3, - BSR_UNKNOWN = 4, - BSR_MAX = 5, + BSR_8 = 0, + BSR_16 = 1, + BSR_64 = 2, + BSR_128 = 3, + BSR_4096 = 4, + BSR_UNKNOWN = 5, + BSR_MAX = 6, }; static unsigned bsr_types[BSR_MAX]; @@ -218,9 +219,11 @@ static int bsr_add_node(struct device_node *bn) case 128: cur->bsr_type = BSR_128; break; + case 4096: + cur->bsr_type = BSR_4096; + break; default: cur->bsr_type = BSR_UNKNOWN; - printk(KERN_INFO "unknown BSR size %d\n",cur->bsr_bytes); } cur->bsr_num = bsr_types[cur->bsr_type];